use new require specs in many places

svn: r8774

collects/afm/ttf-to-glyphlist.ss

@@ -4,9 +4,9 @@
   ;; http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html
   ;; http://www.microsoft.com/typography/otspec/otff.htm
   
-  (require (lib "etc.ss")
+  (require mzlib/etc
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "cmdline.ss"))
+	   mzlib/cmdline)
   
   (define (read-fixed p)
     (integer-bytes->integer (read-bytes 4 p) #f #t))

collects/algol60/algol60.ss

@@ -11,7 +11,7 @@
                          "compile.ss"
 			 ;; Compiles a simplified AST to Scheme.
 
-                         (lib "file.ss"))
+                         mzlib/file)
 
      ;; By using #'here for the context of identifiers
      ;; introduced by compilation, the identifiers can

collects/algol60/cfg-parser.ss

@@ -29,12 +29,12 @@
 ;; tokens.
 
 (module cfg-parser mzscheme
-  (require (lib "yacc.ss" "parser-tools")
+  (require parser-tools/yacc
-	   (lib "lex.ss" "parser-tools")
+	   parser-tools/lex
-           (lib "list.ss")
+           mzlib/list
-           (lib "etc.ss"))
+           mzlib/etc)
-  (require-for-syntax (lib "boundmap.ss" "syntax")
+  (require-for-syntax syntax/boundmap
-                      (lib "list.ss")
+                      mzlib/list
 		      (lib "token-syntax.ss" "parser-tools" "private-lex"))
 
   (provide cfg-parser)

collects/algol60/compile.ss

@@ -1,7 +1,7 @@
 #cs(module compile mzscheme
      (require "parse.ss"
-              (lib "match.ss")
+              mzlib/match
-              (lib "list.ss"))
+              mzlib/list)
      
      (provide compile-simplified)
 

collects/algol60/parse.ss

@@ -1,9 +1,9 @@
 #cs(module parse mzscheme
-     (require (lib "lex.ss" "parser-tools")
+     (require parser-tools/lex
-              (prefix : (lib "lex-sre.ss" "parser-tools"))
+              (prefix : parser-tools/lex-sre)
               "cfg-parser.ss"
-	      (lib "yacc.ss" "parser-tools")
+	      parser-tools/yacc
-              (lib "readerr.ss" "syntax")
+              syntax/readerr
               "prims.ss")
      
      (define-lex-abbrevs [lex:letter (:or (:/ #\a #\z) (:/ #\A #\Z))]

collects/algol60/simplify.ss

@@ -1,7 +1,7 @@
 #cs(module simplify mzscheme
      (require "parse.ss"
               "prims.ss"
-              (lib "match.ss"))
+              mzlib/match)
      
      (provide simplify)
       

collects/algol60/tool.ss

@@ -1,18 +1,18 @@
 (module tool mzscheme
   (require (lib "tool.ss" "drscheme")
-           (lib "mred.ss" "mred")
+           mred
-           (lib "unit.ss")
+           mzlib/unit
-           (lib "class.ss")
+           mzlib/class
            "parse.ss"
            "simplify.ss"
            "compile.ss"
-	   (lib "embed.ss" "compiler")
+	   compiler/embed
-	   (lib "string-constant.ss" "string-constants")
+	   string-constants
 	   (prefix bd: "bd-tool.ss"))
 
   (provide tool@)
 
-  (define base-importing-stx (dynamic-require '(lib "algol60/base.ss")
+  (define base-importing-stx (dynamic-require 'mzlib/algol60/base
 					     'base-importing-stx))
 
   (define tool@
@@ -88,8 +88,8 @@
           (define/public (get-teachpack-names) null)
           (define/public (marshall-settings x) x)
           (define/public (on-execute settings run-in-user-thread)
-            (dynamic-require '(lib "algol60/base.ss") #f)
+            (dynamic-require 'mzlib/algol60/base #f)
-            (let ([path ((current-module-name-resolver) '(lib "algol60/base.ss") #f #f)]
+            (let ([path ((current-module-name-resolver) 'mzlib/algol60/base #f #f)]
                   [n (current-namespace)])
               (run-in-user-thread
                (lambda ()
@@ -115,10 +115,10 @@
 						base-importing-stx)])
 		  (make-embedding-executable dst-file
 					     #f #f
-					     '((#f (lib "algol60/base.ss")))
+					     '((#f mzlib/algol60/base))
 					     null
 					     (compile
-					      `(module m (lib "algol60/base.ss")
+					      `(module m mzlib/algol60/base
 						 ,code))
 					     (list "-mvqe" "(require m)"))))))
 	  (define/public (get-one-line-summary) "Algol 60 (not Scheme at all!)")

collects/browser/browser-sig.ss

@@ -1,5 +1,5 @@
 (module browser-sig mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
            "private/sig.ss")
 
   (provide browser^)

collects/browser/browser-unit.ss

@@ -1,10 +1,10 @@
 (module browser-unit mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
            (lib "mred-sig.ss" "mred")
            (lib "plt-installer-sig.ss" "setup")
-           (lib "tcp-sig.ss" "net")
+           net/tcp-sig
-           (lib "url-sig.ss" "net")
+           net/url-sig
-           (lib "url-unit.ss" "net")
+           net/url-unit
            "browser-sig.ss"
            "private/sig.ss"
            "private/bullet.ss"

collects/browser/browser.ss

@@ -1,12 +1,12 @@
 (module browser mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (lib "mred.ss" "mred")
+           mred
            (lib "mred-sig.ss" "mred")
            (lib "plt-installer-sig.ss" "setup")
            (lib "plt-installer.ss" "setup")
-           (lib "tcp-sig.ss" "net")
+           net/tcp-sig
-           (lib "url-sig.ss" "net")
+           net/url-sig
-           (lib "url.ss" "net")
+           net/url
            "browser-sig.ss"
            "browser-unit.ss")
   

collects/browser/external.ss

@@ -1,13 +1,13 @@
 (module external mzscheme
-  (require (lib "string-constant.ss" "string-constants")
+  (require string-constants
-           (lib "mred.ss" "mred")
+           mred
-           (lib "class.ss")
+           mzlib/class
-           (lib "file.ss")
+           mzlib/file
-           (lib "list.ss")
+           mzlib/list
-           (lib "match.ss")
+           mzlib/match
-           (prefix raw: (lib "sendurl.ss" "net"))
+           (prefix raw: net/sendurl)
-           (lib "url.ss" "net")
+           net/url
-           (prefix fw: (lib "framework.ss" "framework")))
+           (prefix fw: framework))
   (provide send-url
            (rename raw:browser-preference? browser-preference?)
            update-browser-preference

collects/browser/htmltext.ss

@@ -1,14 +1,14 @@
 
 (module htmltext mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (lib "class.ss")
+           mzlib/class
            "browser-sig.ss"
            "private/sig.ss"
            "private/html.ss"
            "private/bullet.ss"
-	   (lib "url.ss" "net")
+	   net/url
-	   (lib "url-sig.ss" "net")
+	   net/url-sig
-           (lib "mred.ss" "mred")
+           mred
            (lib "mred-unit.ss" "mred")
            (lib "mred-sig.ss" "mred")
 	   (lib "external.ss" "browser"))

collects/browser/private/bullet.ss

@@ -1,6 +1,6 @@
 (module bullet mzscheme 
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "class.ss"))
+           mzlib/class)
   
   (provide bullet-snip%
 	   get-bullet-width

collects/browser/private/html.ss

@@ -3,12 +3,12 @@
 (require "sig.ss"
          (lib "mred-sig.ss" "mred")
          scheme/file
-         (lib "port.ss")
+         mzlib/port
-         (lib "url-sig.ss" "net")
+         net/url-sig
          (only-in (lib "html.ss" "html")
                   read-html-as-xml read-html-comments use-html-spec)
          (except-in (lib "xml.ss" "xml") read-comments)
-         (lib "class.ss")
+         mzlib/class
          "bullet.ss"
          "option-snip.ss"
          "entity-names.ss")

collects/browser/private/hyper.ss

@@ -2,10 +2,7 @@
 A test case:
 
 (module tmp mzscheme
-   (require (lib "class.ss")
+   (require mzlib/class mred browser framework)
-	    (lib "mred.ss" "mred")
-	    (lib "browser.ss" "browser")
-            (lib "framework.ss" "framework"))
    
    (define f%
      (frame:status-line-mixin 
@@ -30,16 +27,16 @@ A test case:
 
 #lang scheme/unit
 
-(require (lib "class.ss")
+(require mzlib/class
          "sig.ss"
          scheme/path
          scheme/file
-         (lib "url-sig.ss" "net")
+         net/url-sig
-         (lib "url-structs.ss" "net")
+         net/url-structs
-         (lib "head.ss" "net")
+         net/head
          (lib "mred-sig.ss" "mred")
-         (lib "framework.ss" "framework")
+         framework
-         (lib "string-constant.ss" "string-constants")
+         string-constants
          (lib "plt-installer-sig.ss" "setup"))
 
    

collects/browser/private/option-snip.ss

@@ -1,7 +1,7 @@
 (module option-snip mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-	   (lib "class.ss")
+	   mzlib/class
-	   (lib "string.ss"))
+	   mzlib/string)
 
   (provide option-snip%
            checkbox-snip%)

collects/browser/tool.ss

@@ -1,6 +1,6 @@
 (module tool mzscheme
   (require (lib "external.ss" "browser")
-           (lib "unit.ss")
+           mzlib/unit
            (lib "tool.ss" "drscheme"))
   (provide tool@)
 

collects/combinator-parser/examples/combinator-example.ss

@@ -1,8 +1,8 @@
 (module combinator-example mzscheme
 
-(require (lib "unit.ss")
+(require mzlib/unit
-         (lib "lex.ss" "parser-tools")
+         parser-tools/lex
-         (lib "combinator-unit.ss" "parser-tools"))
+         parser-tools/combinator-unit)
 
 (define-unit support
   (import)

collects/combinator-parser/private-combinator/combinator-parser.scm

@@ -1,7 +1,6 @@
 (module combinator-parser lazy
 
-  (require (lib "unit.ss")
+  (require mzlib/unit parser-tools/lex)
-           (lib "lex.ss" "parser-tools"))
 
   (require "structs.scm" "parser-sigs.ss" "combinator.scm" "errors.scm")
 

collects/combinator-parser/private-combinator/combinator.scm

@@ -1,11 +1,11 @@
 (module combinator lazy
   
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (only (lib "etc.ss") opt-lambda))
+           (only mzlib/etc opt-lambda))
   
   (require "structs.scm"
            "parser-sigs.ss"
-           (lib "lex.ss" "parser-tools"))
+           parser-tools/lex)
   
   (provide (all-defined))
   

collects/combinator-parser/private-combinator/errors.scm

@@ -2,10 +2,10 @@
   
   (require "structs.scm" "parser-sigs.ss")
   
-  (require (lib "force.ss" "lazy")
+  (require lazy/force
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "unit.ss")
+           mzlib/unit
-           (lib "list.ss"))
+           mzlib/list)
   
   (provide (all-defined))
   

collects/combinator-parser/private-combinator/parser-sigs.ss

@@ -1,10 +1,10 @@
 (module parser-sigs mzscheme
   
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
-  (require (only (lib "etc.ss") opt-lambda))    ; Required for expansion
+  (require (only mzlib/etc opt-lambda))    ; Required for expansion
-  (require (lib "lex.ss" "parser-tools")
+  (require parser-tools/lex
-           (lib "string.ss") (lib "list.ss"))
+           mzlib/string mzlib/list)
   
   (provide (all-defined))
   

collects/combinator-parser/private-combinator/structs.scm

@@ -2,8 +2,8 @@
   
   (provide (all-defined-except make-fail-type))
   
-  (require (lib "force.ss" "lazy")
+  (require lazy/force
-           (lib "lex.ss" "parser-tools"))
+           parser-tools/lex)
     
   ;fail-src: (list line col pos span loc)
 

collects/compiler/bundle-dist.ss

@@ -1,10 +1,10 @@
 
 (module bundle-dist mzscheme
-  (require (lib "etc.ss")
+  (require mzlib/etc
-	   (lib "file.ss")
+	   mzlib/file
-	   (lib "process.ss")
+	   mzlib/process
-	   (lib "zip.ss")
+	   mzlib/zip
-	   (lib "tar.ss"))
+	   mzlib/tar)
 
   (provide bundle-put-file-extension+style+filters
 	   bundle-directory)

collects/compiler/cffi.ss

@@ -7,9 +7,9 @@
 ;; of expression.
 
 (module cffi mzscheme
-  (require (lib "stx.ss" "syntax"))
+  (require syntax/stx)
-  (require-for-syntax (lib "name.ss" "syntax")
+  (require-for-syntax syntax/name
-                      (lib "path-spec.ss" "syntax"))
+                      syntax/path-spec)
 
   (define-syntax c-lambda
     (let ([re:fname (regexp "^[a-zA-Z_0-9]+$")]

collects/compiler/compiler.ss

@@ -1,16 +1,16 @@
 
 (module compiler mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
   
   (require "sig.ss")
 
-  (require (lib "compile-sig.ss" "dynext"))
+  (require dynext/compile-sig)
-  (require (lib "link-sig.ss" "dynext"))
+  (require dynext/link-sig)
-  (require (lib "file-sig.ss" "dynext"))
+  (require dynext/file-sig)
   ;;
-  (require (lib "compile.ss" "dynext"))
+  (require dynext/compile)
-  (require (lib "link.ss" "dynext"))
+  (require dynext/link)
-  (require (lib "file.ss" "dynext"))
+  (require dynext/file)
 
   (require "option.ss")
 

collects/compiler/distribute.ss

@@ -2,10 +2,10 @@
 (module distribute scheme/base
   (require scheme/file
            scheme/path
-           (lib "dirs.ss" "setup")
+           setup/dirs
-	   (lib "list.ss")
+	   mzlib/list
 	   (lib "variant.ss" "setup")
-	   (lib "filename-version.ss" "dynext")
+	   dynext/filename-version
 	   "private/macfw.ss"
 	   "private/windlldir.ss"
 	   "private/collects-path.ss")

collects/compiler/embed-sig.ss

@@ -1,6 +1,6 @@
 
 (module embed-sig mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
   (provide compiler:embed^)
 
   (define-signature compiler:embed^

collects/compiler/embed-unit.ss

@@ -435,7 +435,7 @@
                                              module-path)])
                                     (syntax-case (expand `(module m mzscheme
                                                             (require (only ,module-path)
-                                                                     (lib "runtime-path.ss"))
+                                                                     mzlib/runtime-path)
                                                             (runtime-paths ,module-path))) (quote)
                                       [(_ m mz (#%mb rfs req (quote (spec ...))))
                                        (syntax->datum #'(spec ...))]

collects/compiler/embed.ss

@@ -1,7 +1,7 @@
 
 (module embed mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (lib "contract.ss"))
+           mzlib/contract)
   
   (require "sig.ss")
   

collects/compiler/main.ss

@@ -25,14 +25,14 @@
   (require "compiler.ss")
 
   ;; Read argv array for arguments and input file name
-  (require (lib "cmdline.ss")
+  (require mzlib/cmdline
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "file.ss" "dynext")
+	   dynext/file
-	   (lib "compile.ss" "dynext")
+	   dynext/compile
-	   (lib "link.ss" "dynext")
+	   dynext/link
 	   (lib "pack.ss" "setup")
 	   (lib "getinfo.ss" "setup")
-	   (lib "dirs.ss" "setup"))
+	   setup/dirs)
 
   (define dest-dir (make-parameter #f))
   (define auto-dest-dir (make-parameter #f))
@@ -408,7 +408,7 @@
 		   ,(if (compiler:option:assume-primitives) 
                         '(void) 
                         '(namespace-require/copy 'scheme))
-		   (require (lib "cffi.ss" "compiler"))
+		   (require compiler/cffi)
 		   ,@(map (lambda (s) `(load ,s)) prefixes)
 		   (void)))))))
      (list "file/directory/collection" "file/directory/sub-collection")))
@@ -457,9 +457,9 @@
 					    (dest-dir)))]
     [(make-zo)
      (let ([n (make-base-empty-namespace)]
-	   [mc (dynamic-require '(lib "mzlib/cm.ss")
+	   [mc (dynamic-require 'mzlib/mzlib/cm
 				'managed-compile-zo)]
-	   [cnh (dynamic-require '(lib "mzlib/cm.ss")
+	   [cnh (dynamic-require 'mzlib/mzlib/cm
 				 'manager-compile-notify-handler)]
 	   [did-one? #f])
        (parameterize ([current-namespace n]
@@ -518,7 +518,7 @@
                         [out-file  (if (dest-dir)
                                        (build-path (dest-dir) out-file)
                                        out-file)])
-		   ((dynamic-require '(lib "xform.ss" "compiler") 'xform)
+		   ((dynamic-require 'compiler/xform 'xform)
 		    (not (compiler:option:verbose))
 		    file
 		    out-file
@@ -555,7 +555,7 @@
 	#:aux (exe-aux))
        (printf " [output to \"~a\"]~n" dest))]
     [(exe-dir)
-     ((dynamic-require '(lib "distribute.ss" "compiler") 
+     ((dynamic-require 'compiler/distribute 
 		       'assemble-distribution)
       (exe-dir-output)
       source-files

collects/compiler/option-unit.ss

@@ -1,6 +1,6 @@
 
 (module option-unit mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (require "sig.ss")
 

collects/compiler/option.ss

@@ -1,6 +1,6 @@
 
 (module option mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (require "sig.ss")
   (require "option-unit.ss")

collects/compiler/private/analyze.ss

@@ -39,11 +39,11 @@
 ;;; ------------------------------------------------------------
 
 (module analyze mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/anorm.ss

@@ -33,11 +33,11 @@
 ;;; ------------------------------------------------------------
 
 (module anorm mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/base.ss

@@ -1,16 +1,16 @@
 
 (module base mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (require "../sig.ss")
   (require "sig.ss")
 
-  (require (lib "zodiac-sig.ss" "syntax")
+  (require syntax/zodiac-sig
-	   (lib "zodiac-unit.ss" "syntax"))
+	   syntax/zodiac-unit)
 
-  (require (lib "file-sig.ss" "dynext")
+  (require dynext/file-sig
-	   (lib "link-sig.ss" "dynext")
+	   dynext/link-sig
-	   (lib "compile-sig.ss" "dynext"))
+	   dynext/compile-sig)
 
   (require "zlayer.ss"
 	   "library.ss"

collects/compiler/private/closure.ss

@@ -17,11 +17,11 @@
 ;;; ------------------------------------------------------------
 
 (module closure mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/const.ss

@@ -11,12 +11,12 @@
 ;  that is prefixed onto the beginning of the program.
 
 (module const mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "etc.ss"))
+	   mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax")
+  (require syntax/zodiac-sig
-	   (lib "stx.ss" "syntax"))
+	   syntax/stx)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/cstructs.ss

@@ -5,11 +5,11 @@
 ;; Mostly structure definitions, mostly for annotations.
 
 (module cstructs mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/driver.ss

@@ -60,20 +60,20 @@
 ;;    the binding.
 
 (module driver mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "file.ss")
+	   mzlib/file
-	   (lib "port.ss")
+	   mzlib/port
-	   (lib "etc.ss")
+	   mzlib/etc
-	   (lib "pretty.ss")
+	   mzlib/pretty
 	   (prefix src2src: "../src2src.ss"))
   
-  (require (lib "zodiac-sig.ss" "syntax")
+  (require syntax/zodiac-sig
-	   (lib "toplevel.ss" "syntax")
+	   syntax/toplevel
-	   (lib "compile-sig.ss" "dynext")
+	   dynext/compile-sig
-	   (lib "link-sig.ss" "dynext")
+	   dynext/link-sig
-	   (lib "file-sig.ss" "dynext")
+	   dynext/file-sig
-	   (lib "dirs.ss" "setup"))
+	   setup/dirs)
 
   (require "../sig.ss"
 	   "sig.ss"
@@ -262,7 +262,7 @@
 	      (eval (or prefix
 			;; Need MzScheme and cffi:
 			'(begin
-			   (require (lib "cffi.ss" "compiler"))
+			   (require compiler/cffi)
 			   (require-for-syntax mzscheme))))))))
 
       ;;----------------------------------------------------------------------
@@ -428,7 +428,7 @@
 
       (define (open-input-scheme-file path)
 	(let ([p (let ([open (with-handlers ([exn:fail? (lambda (x) #f)])
-			       (dynamic-require '(lib "mred.ss" "mred") 'open-input-graphical-file))])
+			       (dynamic-require 'mred 'open-input-graphical-file))])
 		   (if open
 		       ;; Handles WXME files:
 		       (open path)

collects/compiler/private/embed.ss

@@ -1,6 +1,6 @@
 
 (module embed mzscheme
-  (require (lib "embed.ss" "compiler"))
+  (require compiler/embed)
   (define mzc:create-embedding-executable create-embedding-executable)
   (define mzc:embedding-executable-add-suffix embedding-executable-add-suffix)
   (provide mzc:create-embedding-executable

collects/compiler/private/known.ss

@@ -21,11 +21,11 @@
 ;;; ------------------------------------------------------------
 
 (module known mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/library.ss

@@ -3,11 +3,11 @@
 ;; (c) 1997-8 PLT, Rice University
 
 (module library mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
 

collects/compiler/private/lift.ss

@@ -21,11 +21,11 @@
 ;;; ------------------------------------------------------------
 
 (module lift mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/macfw.ss

@@ -1,8 +1,8 @@
 
 (module macfw mzscheme
   (require "mach-o.ss"
-	   (lib "string.ss")
+	   mzlib/string
-	   (lib "process.ss"))
+	   mzlib/process)
 
   (provide update-framework-path
 	   get-current-framework-path

collects/compiler/private/prephase.ss

@@ -40,9 +40,9 @@
 ;;; ------------------------------------------------------------
 
 (module prephase mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/rep.ss

@@ -15,9 +15,9 @@
 ;;; ------------------------------------------------------------
 
 (module rep mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/sig.ss

@@ -1,9 +1,9 @@
 
 (module sig mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (require "../sig.ss")
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (define for-syntax-in-env-stx #'for-syntax-in-env)
   (provide for-syntax-in-env-stx)

collects/compiler/private/toplevel.ss

@@ -3,7 +3,7 @@
 ;; (c) 1997-2001 PLT
 
 (module toplevel mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (require "sig.ss")
 

collects/compiler/private/vehicle.ss

@@ -20,9 +20,9 @@
 ;;; ------------------------------------------------------------
 
 (module vehicle mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/vm2c.ss

@@ -3,11 +3,11 @@
 ;; (c) 1997-2001 PLT
 
 (module vm2c mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "list.ss"))
+	   mzlib/list)
 
-  (require (lib "zodiac-sig.ss" "syntax")
+  (require syntax/zodiac-sig
-	   (lib "primitives.ss" "syntax"))
+	   syntax/primitives)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/vmopt.ss

@@ -8,11 +8,11 @@
 
 (module vmopt mzscheme
   
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/vmphase.ss

@@ -10,12 +10,12 @@
 ;;  to macro uses (where the macros are defined in mzc.h).
 
 (module vmphase mzscheme 
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "etc.ss"))
+	   mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax")
+  (require syntax/zodiac-sig
-	   (lib "primitives.ss" "syntax"))
+	   syntax/primitives)
 
   (require "sig.ss"
 	   "../sig.ss")

collects/compiler/private/vmscheme.ss

@@ -6,11 +6,11 @@
 
 (module vmscheme mzscheme
   
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "list.ss")
+	   mzlib/list
-	   (lib "etc.ss"))
+	   mzlib/etc)
 
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "sig.ss")
   (require "../sig.ss")

collects/compiler/private/windlldir.ss

@@ -1,6 +1,6 @@
 
 (module windlldir mzscheme
-  (require (lib "port.ss")
+  (require mzlib/port
 	   "winutf16.ss")
 
   (provide update-dll-dir

collects/compiler/private/winicon.ss

@@ -1,6 +1,6 @@
 
 (module winicon mzscheme
-  (require (lib "list.ss"))
+  (require mzlib/list)
   (provide install-icon
 	   extract-icons
 	   parse-icon
@@ -627,8 +627,8 @@
   ;;  moved somewhere else.
   #;
   (begin
-    (require (lib "mred.ss" "mred")
+    (require mred
-             (lib "class.ss"))
+             mzlib/class)
     (define (bitmap%->icon bm)
       (let* ([w (send bm get-width)]
              [h (send bm get-height)]

collects/compiler/private/xform.ss

@@ -1,7 +1,7 @@
 (module xform mzscheme
-  (require (lib "list.ss")
+  (require mzlib/list
-	   (lib "etc.ss")
+	   mzlib/etc
-	   (lib "process.ss"))
+	   mzlib/process)
   
   (provide xform)
   

collects/compiler/private/zlayer.ss

@@ -3,11 +3,11 @@
 ;; (c)1997-2001 PLT
 
 (module zlayer mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	  (lib "list.ss")
+	  mzlib/list
-	  (lib "etc.ss"))
+	  mzlib/etc)
   
-  (require (lib "zodiac-sig.ss" "syntax"))
+  (require syntax/zodiac-sig)
 
   (require "../sig.ss")
   (require "sig.ss")

collects/compiler/sig.ss

@@ -1,7 +1,7 @@
 
 (module sig mzscheme
 
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (provide compiler:option^
 	   compiler^

collects/compiler/src2src.ss

@@ -7,11 +7,11 @@
 ;;  specially preserved for `lambda' expressions.
 
 (module src2src scheme/base
-  (require (lib "class.ss")
+  (require mzlib/class
-	   (lib "kerncase.ss" "syntax")
+	   syntax/kerncase
-	   (lib "primitives.ss" "syntax")
+	   syntax/primitives
-	   (lib "etc.ss")
+	   mzlib/etc
-	   (lib "list.ss"))
+	   mzlib/list)
 
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; Optimizer

collects/compiler/to-core.ss

@@ -1,8 +1,8 @@
 (module to-core mzscheme
-  (require (lib "kerncase.ss" "syntax")
+  (require syntax/kerncase
-           (lib "stx.ss" "syntax")
+           syntax/stx
-           (lib "list.ss")
+           mzlib/list
-           (lib "boundmap.ss" "syntax"))
+           syntax/boundmap)
 
   (provide top-level-to-core)
 

collects/compiler/xform.ss

@@ -1,6 +1,6 @@
 
 (module xform mzscheme
-  (require (lib "compile.ss" "dynext")
+  (require dynext/compile
 	   (prefix xform: "private/xform.ss"))
 
   (provide xform)

collects/drscheme/arrow.ss

@@ -1,9 +1,9 @@
 
 (module arrow mzscheme
-  (require (lib "class.ss")
+  (require mzlib/class
-           (lib "list.ss")
+           mzlib/list
-           (lib "math.ss")
+           mzlib/math
-	   (lib "mred.ss" "mred"))
+	   mred)
   
   (provide draw-arrow)
     

collects/drscheme/drscheme.ss

@@ -18,8 +18,8 @@
                                  [use-compiled-file-paths '()])
                     (values
                      (dynamic-require '(lib "zo-compile.ss" "errortrace") 'zo-compile)
-                     (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler)
+                     (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
-                     (dynamic-require '(lib "cm.ss") 'manager-trace-handler)))])
+                     (dynamic-require 'mzlib/cm 'manager-trace-handler)))])
       (current-compile zo-compile)
       (use-compiled-file-paths (list (build-path "compiled" "errortrace")))
       (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
@@ -36,8 +36,8 @@
                    manager-trace-handler)
                   (parameterize ([current-namespace (make-namespace)])
                     (values
-                     (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler)
+                     (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
-                     (dynamic-require '(lib "cm.ss") 'manager-trace-handler)))])
+                     (dynamic-require 'mzlib/cm 'manager-trace-handler)))])
       (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
       (when cm-trace?
         (printf "PLTDRCM: enabling CM tracing\n")

collects/drscheme/installer.ss

@@ -1,7 +1,7 @@
 (module installer mzscheme
-  (require (lib "file.ss")
+  (require mzlib/file
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "launcher.ss" "launcher"))
+           launcher)
   (provide installer)
   
   (define (installer plthome)

collects/drscheme/private/app.ss

@@ -1,11 +1,11 @@
 
 #lang scheme/unit
-  (require (lib "class.ss")
+  (require mzlib/class
-           (lib "list.ss")
+           mzlib/list
            scheme/file
-           (lib "string-constant.ss" "string-constants")
+           string-constants
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
            (lib "external.ss" "browser")
            (lib "getinfo.ss" "setup")
            "drsig.ss"

collects/drscheme/private/auto-language.ss

@@ -1,6 +1,6 @@
 (module auto-language mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "class.ss"))
+           mzlib/class)
   
   (provide pick-new-language looks-like-module?)
   

collects/drscheme/private/bindings-browser.ss

@@ -8,14 +8,14 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
 |#
 
 (module bindings-browser mzscheme
-  (require (lib "pretty.ss")
+  (require mzlib/pretty
-           (lib "list.ss")
+           mzlib/list
-           (lib "class.ss")
+           mzlib/class
-           (lib "mred.ss" "mred")
+           mred
-           (lib "match.ss")
+           mzlib/match
-           (lib "string.ss")
+           mzlib/string
            (lib "marks.ss" "stepper" "private")
-           (lib "contract.ss"))
+           mzlib/contract)
   
   (provide render-bindings/snip)
 

collects/drscheme/private/debug.ss

@@ -7,16 +7,16 @@ profile todo:
 |#
 
 (module debug mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
            (lib "stacktrace.ss" "errortrace")
-           (lib "class.ss")
+           mzlib/class
-           (lib "list.ss")
+           mzlib/list
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "file.ss")
+           mzlib/file
            "drsig.ss"
-           (lib "framework.ss" "framework")
+           framework
-           (lib "mred.ss" "mred")
+           mred
-           (lib "string-constant.ss" "string-constants")
+           string-constants
            (lib "bday.ss" "framework" "private")
            "bindings-browser.ss")
   

collects/drscheme/private/drscheme-normal.ss

@@ -1,8 +1,8 @@
 
 (module drscheme-normal mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "class.ss")
+           mzlib/class
-           (lib "cmdline.ss")
+           mzlib/cmdline
            (lib "bday.ss" "framework" "private"))
 
   ; (current-load text-editor-load-handler)

collects/drscheme/private/eval.ss

@@ -1,18 +1,18 @@
 
 (module eval mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "unit.ss")
+           mzlib/unit
-           (lib "port.ss")
+           mzlib/port
-           (lib "class.ss")
+           mzlib/class
-           (lib "toplevel.ss" "syntax")
+           syntax/toplevel
-           (lib "framework.ss" "framework")
+           framework
            "drsig.ss")
   
   ;; to ensure this guy is loaded (and the snipclass installed) in the drscheme namespace & eventspace
   ;; these things are for effect only!
   (require (lib "cache-image-snip.ss" "mrlib")
            #;
-           (prefix foo (lib "matrix.ss" "htdp")))
+           (prefix foo htdp/matrix))
   
   (define op (current-output-port))
   (define (oprintf . args) (apply fprintf op args))

collects/drscheme/private/font.ss

@@ -1,10 +1,10 @@
 (module font mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (lib "class.ss")
+           mzlib/class
            "drsig.ss"
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
-           (lib "string-constant.ss" "string-constants"))
+           string-constants)
   
   (define sc-smoothing-label (string-constant font-smoothing-label))
   (define sc-smoothing-none (string-constant font-smoothing-none))

collects/drscheme/private/frame.ss

@@ -1,15 +1,15 @@
 
 #lang scheme/unit
-  (require (lib "string-constant.ss" "string-constants")
+  (require string-constants
-           (lib "match.ss")
+           mzlib/match
-           (lib "class.ss")
+           mzlib/class
-           (lib "string.ss")
+           mzlib/string
-           (lib "list.ss")
+           mzlib/list
            "drsig.ss"
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
-           (lib "url.ss" "net")
+           net/url
-           (lib "head.ss" "net")
+           net/head
            (lib "plt-installer.ss" "setup")
            (lib "bug-report.ss" "help")
            scheme/file)

collects/drscheme/private/get-extend.ss

@@ -1,9 +1,9 @@
 
 #lang scheme/unit
-  (require (lib "class.ss")
+  (require mzlib/class
            "drsig.ss"
-           (lib "mred.ss" "mred")
+           mred
-           (lib "etc.ss"))
+           mzlib/etc)
   
   
   

collects/drscheme/private/help-desk.ss

@@ -1,13 +1,13 @@
 #lang scheme/unit
 
-(require (lib "string-constant.ss" "string-constants")
+(require string-constants
-         (lib "mred.ss" "mred")
+         mred
          (lib "external.ss" "browser")
          (lib "bug-report.ss" "help")
          (lib "buginfo.ss" "help" "private")
-         (lib "framework.ss" "framework")
+         framework
-         (lib "class.ss")
+         mzlib/class
-         (lib "list.ss")
+         mzlib/list
          (lib "search.ss" "help")
          "drsig.ss")
 

collects/drscheme/private/init.ss

@@ -1,9 +1,9 @@
 
 #lang scheme/unit
-  (require (lib "string-constant.ss" "string-constants")
+  (require string-constants
            "drsig.ss"
-           (lib "list.ss")
+           mzlib/list
-           (lib "mred.ss" "mred"))
+           mred)
   
   
   (import)

collects/drscheme/private/insert-large-letters.ss

@@ -1,9 +1,6 @@
 #lang scheme/base
 
-(require mred/mred
+(require mred scheme/class string-constants framework)
-         scheme/class
-         string-constants/string-constant
-         framework/framework)
 
 (provide insert-large-letters)
 

collects/drscheme/private/label-frame-mred.ss

@@ -1,7 +1,7 @@
 (module label-frame-mred mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "class.ss"))
+           mzlib/class)
-  (provide (all-from-except (lib "mred.ss" "mred") frame%)
+  (provide (all-from-except mred frame%)
            (rename registering-frame% frame%)
            lookup-frame-name)
   

collects/drscheme/private/language-configuration.ss

@@ -1,20 +1,20 @@
 
 (module language-configuration mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
            (lib "hierlist.ss" "hierlist")
-           (lib "class.ss")
+           mzlib/class
-           (lib "contract.ss")
+           mzlib/contract
-           (lib "kw.ss")
+           mzlib/kw
-           (lib "string.ss")
+           mzlib/string
            "drsig.ss"
-           (lib "string-constant.ss" "string-constants")
+           string-constants
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
-           (lib "list.ss")
+           mzlib/list
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "file.ss")
+           mzlib/file
            (lib "getinfo.ss" "setup")
-           (lib "toplevel.ss" "syntax"))
+           syntax/toplevel)
   
   (define original-output (current-output-port))
   (define (printfo . args) (apply fprintf original-output args))

collects/drscheme/private/language.ss

@@ -5,21 +5,21 @@
 
 #lang scheme/unit
   (require "drsig.ss"
-           (lib "string-constant.ss" "string-constants")
+           string-constants
-           (lib "pconvert.ss")
+           mzlib/pconvert
-           (lib "pretty.ss")
+           mzlib/pretty
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "struct.ss")
+           mzlib/struct
-           (lib "class.ss")
+           mzlib/class
            scheme/file
-           (lib "list.ss")
+           mzlib/list
-           (lib "embed.ss" "compiler")
+           compiler/embed
-           (lib "launcher.ss" "launcher")
+           launcher
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
            (lib "syntax-browser.ss" "mrlib")
-           (lib "distribute.ss" "compiler")
+           compiler/distribute
-           (lib "bundle-dist.ss" "compiler"))
+           compiler/bundle-dist)
   
   (import [prefix drscheme:debug: drscheme:debug^]
           [prefix drscheme:tools: drscheme:tools^]
@@ -457,8 +457,8 @@
   ;; simple-module-based-language-get-init-code : setting -> sexp[module]
   (define (simple-module-based-language-get-init-code setting)
     `(module mod-name mzscheme
-       (require (lib "pconvert.ss")
+       (require mzlib/pconvert
-                (lib "pretty.ss"))
+                mzlib/pretty)
        
        (provide init-code)
        

collects/drscheme/private/launcher-bootstrap.ss

@@ -1,6 +1,6 @@
 (module launcher-bootstrap mzscheme
-  (require (lib "string.ss")
+  (require mzlib/string
-           (lib "file.ss"))
+           mzlib/file)
   
   (define argv (current-command-line-arguments))
   ;; skip first six

collects/drscheme/private/link.ss

@@ -7,7 +7,7 @@
            "debug.ss"
            "module-language.ss"
            "tools.ss"
-           (lib "unit.ss")
+           mzlib/unit
            "language.ss"
            "language-configuration.ss"
            "drsig.ss"

collects/drscheme/private/main.ss

@@ -1,12 +1,12 @@
 #lang scheme/unit
 
-(require (lib "string-constant.ss" "string-constants")
+(require string-constants
-         (lib "contract.ss")
+         mzlib/contract
          "drsig.ss"
-         (lib "mred.ss" "mred")
+         mred
-         (lib "framework.ss" "framework")
+         framework
-         (lib "class.ss")
+         mzlib/class
-         (lib "list.ss")
+         mzlib/list
          scheme/path
          (lib "external.ss" "browser")
          (lib "plt-installer.ss" "setup"))

collects/drscheme/private/modes.ss

@@ -1,8 +1,8 @@
 #lang scheme/unit
-  (require (lib "string-constant.ss" "string-constants")
+  (require string-constants
-           (lib "class.ss")
+           mzlib/class
-           (lib "list.ss")
+           mzlib/list
-           (lib "framework.ss" "framework")
+           framework
            "drsig.ss")
   
   (import)

collects/drscheme/private/module-language.ss

@@ -1,15 +1,15 @@
 
 (module module-language mzscheme
   (provide module-language@)
-  (require (lib "unit.ss")
+  (require mzlib/unit
-           (lib "class.ss")
+           mzlib/class
-           (lib "mred.ss" "mred")
+           mred
-           (lib "embed.ss" "compiler")
+           compiler/embed
-           (lib "launcher.ss" "launcher")
+           launcher
-           (lib "framework.ss" "framework")
+           framework
-           (lib "string-constant.ss" "string-constants")
+           string-constants
            "drsig.ss"
-           (lib "contract.ss"))
+           mzlib/contract)
   
   (define op (current-output-port))
   (define (oprintf . args) (apply fprintf op args))

collects/drscheme/private/module-overview.ss

@@ -1,11 +1,11 @@
 #lang scheme/base
 
-(require mred/mred
+(require mred
          scheme/class
          syntax/moddep
          syntax/toplevel
          framework/framework
-         string-constants/string-constant
+         string-constants
          mrlib/graph
          "drsig.ss"
          scheme/unit

collects/drscheme/private/multi-file-search.ss

@@ -1,13 +1,13 @@
 
 #lang scheme/unit
-  (require (lib "framework.ss" "framework")
+  (require framework
-           (lib "class.ss")
+           mzlib/class
-           (lib "mred.ss" "mred")
+           mred
            scheme/file
            scheme/path
-           (lib "thread.ss")
+           mzlib/thread
-           (lib "async-channel.ss")
+           mzlib/async-channel
-           (lib "string-constant.ss" "string-constants")
+           string-constants
            "drsig.ss")
   
   (import [prefix drscheme:frame: drscheme:frame^]

collects/drscheme/private/number-snip.ss

@@ -1,7 +1,7 @@
 (module number-snip mzscheme
-  (require (lib "mred.ss" "mred")
+  (require mred
-           (lib "class.ss")
+           mzlib/class
-           (lib "framework.ss" "framework"))
+           framework)
   
   (provide snip-class)
   (define snip-class (make-object number-snip:snip-class%))

collects/drscheme/private/rep.ss

@@ -18,17 +18,17 @@ TODO
 ;;          user's io ports, to aid any debugging printouts.
 ;;          (esp. useful when debugging the users's io)
 (module rep mzscheme
-  (require (lib "class.ss")
+  (require mzlib/class
-           (lib "file.ss")
+           mzlib/file
-           (lib "pretty.ss")
+           mzlib/pretty
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "list.ss")
+           mzlib/list
-           (lib "port.ss")
+           mzlib/port
-           (lib "unit.ss")
+           mzlib/unit
            "drsig.ss"
-           (lib "string-constant.ss" "string-constants")
+           string-constants
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework")
+           framework
            (lib "external.ss" "browser")
            (lib "default-lexer.ss" "syntax-color"))
   

collects/drscheme/private/stick-figures.ss

@@ -1,7 +1,7 @@
 (module stick-figures mzscheme
-  (require (lib "class.ss")
+  (require mzlib/class
-           (lib "pretty.ss")
+           mzlib/pretty
-           (lib "mred.ss" "mred"))
+           mred)
   
   (define head-size 40)
   (define small-bitmap-factor 1/2)

collects/drscheme/private/syncheck-debug.ss

@@ -1,8 +1,8 @@
 (module syncheck-debug mzscheme
-  (require (lib "pretty.ss")
+  (require mzlib/pretty
-           (lib "list.ss")
+           mzlib/list
-           (lib "class.ss")
+           mzlib/class
-           (lib "mred.ss" "mred"))
+           mred)
   
   (provide debug-origin)  ;; : syntax [syntax] -> void
   ;; creates a frame for examining the 

collects/drscheme/private/text.ss

@@ -1,8 +1,8 @@
 
 #lang scheme/unit
-  (require (lib "class.ss")
+  (require mzlib/class
            "drsig.ss"
-           (lib "framework.ss" "framework"))
+           framework)
   
   (import)
   (export drscheme:text^)

collects/drscheme/private/time-keystrokes.ss

@@ -1,12 +1,12 @@
 (module time-keystrokes mzscheme
   
   (require (lib "tool.ss" "drscheme")
-           (lib "list.ss")
+           mzlib/list
-           (lib "unit.ss")
+           mzlib/unit
-           (lib "class.ss")
+           mzlib/class
-           (lib "etc.ss")
+           mzlib/etc
-           (lib "mred.ss" "mred")
+           mred
-           (lib "framework.ss" "framework"))
+           framework)
   
   (provide tool@)
   

collects/drscheme/private/tool-contract-language.ss

@@ -2,8 +2,8 @@
   (provide (rename -#%module-begin #%module-begin)
            (all-from-except mzscheme #%module-begin))
   
-  (require (lib "contract.ss"))
+  (require mzlib/contract)
-  (require-for-syntax (lib "list.ss"))
+  (require-for-syntax mzlib/list)
   
   (define-syntax (-#%module-begin stx)
     

collects/drscheme/private/tools.ss

@@ -1,14 +1,14 @@
 
 #lang scheme/unit
   (require (lib "getinfo.ss" "setup")
-           (lib "mred.ss" "mred")
+           mred
-           (lib "class.ss")
+           mzlib/class
-           (lib "list.ss")
+           mzlib/list
            "drsig.ss"
-           (lib "contract.ss")
+           mzlib/contract
            "tool-contracts.ss"
-           (lib "framework.ss" "framework")
+           framework
-           (lib "string-constant.ss" "string-constants"))
+           string-constants)
   
   (import [prefix drscheme:frame: drscheme:frame^]
           [prefix drscheme:unit: drscheme:unit^]

collects/drscheme/private/unit.ss

@@ -18,9 +18,9 @@ module browser threading seems wrong.
            scheme/path
            scheme/port
            scheme/list
-           (only-in (lib "etc.ss") compose)
+           (only-in mzlib/etc compose)
-           (lib "string-constant.ss" "string-constants")
+           string-constants
-           (lib "framework.ss" "framework")
+           framework
            (lib "name-message.ss" "mrlib")
            (lib "bitmap-label.ss" "mrlib")
            (lib "include-bitmap.ss" "mrlib")
@@ -30,10 +30,10 @@ module browser threading seems wrong.
            
            (prefix-in drscheme:arrow: "../arrow.ss")
            
-           (lib "mred.ss" "mred")
+           mred
-           (prefix-in mred: (lib "mred.ss" "mred"))
+           (prefix-in mred: mred)
            
-           (lib "date.ss"))
+           mzlib/date)
   
   (provide unit@)
   

collects/drscheme/syncheck.ss

@@ -17,7 +17,7 @@ If the namespace does not, they are colored the unbound color.
 |#
 
 
-(require string-constants/string-constant
+(require string-constants
          scheme/unit
          scheme/contract
          scheme/class
@@ -28,7 +28,7 @@ If the namespace does not, they are colored the unbound color.
          mrlib/bitmap-label
          (prefix-in drscheme:arrow: drscheme/arrow)
          (prefix-in fw: framework/framework)
-         mred/mred
+         mred
          setup/xref
          scribble/xref
          scribble/manual-struct

collects/drscheme/tool-lib.ss

@@ -10,9 +10,9 @@ all of the names in the tools library, for use defining keybindings
 (module tool-lib mzscheme
   (require "private/link.ss"
 	   "private/drsig.ss"
-	   (lib "class.ss")
+	   mzlib/class
-	   (lib "unit.ss")
+	   mzlib/unit
-           (lib "framework.ss" "framework")
+           framework
 	   (lib "splash.ss" "framework"))
 
   (shutdown-splash)

collects/dynext/compile-sig.ss

@@ -1,6 +1,6 @@
 
 (module compile-sig mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (provide dynext:compile^)
   

collects/dynext/compile-unit.ss

@@ -1,9 +1,9 @@
 
 (module compile-unit mzscheme
-  (require (lib "unit.ss")
+  (require mzlib/unit
-	   (lib "include.ss")
+	   mzlib/include
-	   (lib "process.ss")
+	   mzlib/process
-	   (lib "sendevent.ss")
+	   mzlib/sendevent
 	   "private/dirs.ss"
 	   "private/cmdargs.ss")