diff --git a/collects/embedded-gui/private/aligned-pasteboard.ss b/collects/embedded-gui/private/aligned-pasteboard.ss index 3e5a3c0b..e2aa618c 100644 --- a/collects/embedded-gui/private/aligned-pasteboard.ss +++ b/collects/embedded-gui/private/aligned-pasteboard.ss @@ -9,9 +9,9 @@ (provide aligned-pasteboard%) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc (lib "click-forwarding-editor.ss" "mrlib") "on-show-pasteboard.ss" "really-resized-pasteboard.ss" diff --git a/collects/embedded-gui/private/alignment-helpers.ss b/collects/embedded-gui/private/alignment-helpers.ss index 85b8b0db..d290a460 100644 --- a/collects/embedded-gui/private/alignment-helpers.ss +++ b/collects/embedded-gui/private/alignment-helpers.ss @@ -1,10 +1,10 @@ (module alignment-helpers mzscheme (require - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "contract.ss") + mzlib/list + mzlib/class + mred + mzlib/contract "interface.ss" "snip-lib.ss") diff --git a/collects/embedded-gui/private/alignment.ss b/collects/embedded-gui/private/alignment.ss index 439b9ad9..593b1fc6 100644 --- a/collects/embedded-gui/private/alignment.ss +++ b/collects/embedded-gui/private/alignment.ss @@ -23,10 +23,10 @@ neck and it is the most readable solution. (module alignment mzscheme (require - (lib "match.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/match + mzlib/contract + mzlib/etc + mzlib/list) (define-struct rect (x y) (make-inspector)) (define-struct abs-rect (ondim offdim) (make-inspector)) diff --git a/collects/embedded-gui/private/button-snip.ss b/collects/embedded-gui/private/button-snip.ss index 426e90be..66dcda3d 100644 --- a/collects/embedded-gui/private/button-snip.ss +++ b/collects/embedded-gui/private/button-snip.ss @@ -3,9 +3,9 @@ (module button-snip mzscheme (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") + mred + mzlib/class + mzlib/etc "snip-wrapper.ss") (provide diff --git a/collects/embedded-gui/private/cue-text.ss b/collects/embedded-gui/private/cue-text.ss index 7712f632..e0b0407f 100644 --- a/collects/embedded-gui/private/cue-text.ss +++ b/collects/embedded-gui/private/cue-text.ss @@ -9,10 +9,10 @@ (module cue-text mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "framework.ss" "framework")) + mzlib/class + mred + mzlib/etc + framework) (provide cue-text-mixin cue-text%) diff --git a/collects/embedded-gui/private/dllist.ss b/collects/embedded-gui/private/dllist.ss index 75fe98d5..52551158 100644 --- a/collects/embedded-gui/private/dllist.ss +++ b/collects/embedded-gui/private/dllist.ss @@ -1,10 +1,10 @@ (module dllist mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "framework.ss" "framework") + mzlib/class + mzlib/list + mzlib/etc + framework "interface.ss") (provide dllist-mixin dllist% head% tail%) diff --git a/collects/embedded-gui/private/embedded-message.ss b/collects/embedded-gui/private/embedded-message.ss index 7da56c0e..500ffc78 100644 --- a/collects/embedded-gui/private/embedded-message.ss +++ b/collects/embedded-gui/private/embedded-message.ss @@ -1,8 +1,8 @@ (module embedded-message mzscheme (require - (lib "mred.ss" "mred") - (lib "class.ss") + mred + mzlib/class "snip-wrapper.ss") (provide embedded-message%) diff --git a/collects/embedded-gui/private/fixed-width-label-snip.ss b/collects/embedded-gui/private/fixed-width-label-snip.ss index 14fd0be9..cb2369be 100644 --- a/collects/embedded-gui/private/fixed-width-label-snip.ss +++ b/collects/embedded-gui/private/fixed-width-label-snip.ss @@ -1,9 +1,9 @@ (module fixed-width-label-snip mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/list + mred) (provide fixed-width-label-snip) diff --git a/collects/embedded-gui/private/grey-editor.ss b/collects/embedded-gui/private/grey-editor.ss index 64c01209..e123911d 100644 --- a/collects/embedded-gui/private/grey-editor.ss +++ b/collects/embedded-gui/private/grey-editor.ss @@ -3,9 +3,9 @@ (provide grey-editor-snip-mixin grey-editor-mixin) (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "framework.ss" "framework")) + mred + mzlib/class + framework) (define *disable-color* (make-object color% 235 235 255)) diff --git a/collects/embedded-gui/private/grid-alignment.ss b/collects/embedded-gui/private/grid-alignment.ss index 44a77bfd..47933e34 100644 --- a/collects/embedded-gui/private/grid-alignment.ss +++ b/collects/embedded-gui/private/grid-alignment.ss @@ -7,11 +7,11 @@ #;(module grid-alignment mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mred + mzlib/etc + mzlib/list + mzlib/match (prefix a: "alignment.ss") (lib "click-forwarding-editor.ss" "mrlib") diff --git a/collects/embedded-gui/private/interface.ss b/collects/embedded-gui/private/interface.ss index 9dbf52d3..d8ffbd87 100644 --- a/collects/embedded-gui/private/interface.ss +++ b/collects/embedded-gui/private/interface.ss @@ -1,6 +1,6 @@ (module interface mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide stretchable-snip<%> alignment<%> diff --git a/collects/embedded-gui/private/lines.ss b/collects/embedded-gui/private/lines.ss index a7e82cf6..81fbe1a5 100644 --- a/collects/embedded-gui/private/lines.ss +++ b/collects/embedded-gui/private/lines.ss @@ -1,9 +1,9 @@ (module lines mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "snip-wrapper.ss" "interface.ss") diff --git a/collects/embedded-gui/private/locked-pasteboard.ss b/collects/embedded-gui/private/locked-pasteboard.ss index 9c111040..d4d5a812 100644 --- a/collects/embedded-gui/private/locked-pasteboard.ss +++ b/collects/embedded-gui/private/locked-pasteboard.ss @@ -5,11 +5,11 @@ (module locked-pasteboard mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss") - (lib "framework.ss" "framework")) + mzlib/class + mred + mzlib/etc + mzlib/contract + framework) (provide/contract (locked-pasteboard-mixin mixin-contract)) diff --git a/collects/embedded-gui/private/on-show-editor.ss b/collects/embedded-gui/private/on-show-editor.ss index 08b867c6..1b1c0820 100644 --- a/collects/embedded-gui/private/on-show-editor.ss +++ b/collects/embedded-gui/private/on-show-editor.ss @@ -1,10 +1,10 @@ (module on-show-editor mzscheme (define (writeln x) (write x) (newline)) (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/class + mzlib/etc + mred + framework "snip-lib.ss") (provide diff --git a/collects/embedded-gui/private/on-show-pasteboard.ss b/collects/embedded-gui/private/on-show-pasteboard.ss index 19d074c3..7af6eeaa 100644 --- a/collects/embedded-gui/private/on-show-pasteboard.ss +++ b/collects/embedded-gui/private/on-show-pasteboard.ss @@ -1,9 +1,9 @@ (module on-show-pasteboard mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/etc + mred) (provide on-show-pasteboard% diff --git a/collects/embedded-gui/private/program-editor.ss b/collects/embedded-gui/private/program-editor.ss index c2c118dc..7274f2ee 100644 --- a/collects/embedded-gui/private/program-editor.ss +++ b/collects/embedded-gui/private/program-editor.ss @@ -22,10 +22,10 @@ is being reset. (module program-editor mzscheme (require - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss") - (lib "framework.ss" "framework") + mred + mzlib/etc + mzlib/class + framework "snip-lib.ss") (provide program-editor-mixin diff --git a/collects/embedded-gui/private/really-resized-pasteboard.ss b/collects/embedded-gui/private/really-resized-pasteboard.ss index 408c8fd3..eec5a660 100644 --- a/collects/embedded-gui/private/really-resized-pasteboard.ss +++ b/collects/embedded-gui/private/really-resized-pasteboard.ss @@ -12,9 +12,9 @@ get text deteleted from them, etc. (module really-resized-pasteboard mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/etc + mzlib/class + mred) (provide really-resized-pasteboard-mixin diff --git a/collects/embedded-gui/private/single-line-text.ss b/collects/embedded-gui/private/single-line-text.ss index a15d939d..4deb5501 100644 --- a/collects/embedded-gui/private/single-line-text.ss +++ b/collects/embedded-gui/private/single-line-text.ss @@ -1,9 +1,9 @@ (module single-line-text mzscheme (require - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "class.ss")) + mred + framework + mzlib/class) (provide single-line-text-mixin) diff --git a/collects/embedded-gui/private/snip-lib.ss b/collects/embedded-gui/private/snip-lib.ss index f6cc573d..fa01ce8f 100644 --- a/collects/embedded-gui/private/snip-lib.ss +++ b/collects/embedded-gui/private/snip-lib.ss @@ -3,11 +3,11 @@ (module snip-lib mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "contract.ss") + mzlib/class + mzlib/etc + mred + mzlib/list + mzlib/contract "interface.ss") ;; a snip diff --git a/collects/embedded-gui/private/snip-wrapper.ss b/collects/embedded-gui/private/snip-wrapper.ss index 28a90c98..b51899f9 100644 --- a/collects/embedded-gui/private/snip-wrapper.ss +++ b/collects/embedded-gui/private/snip-wrapper.ss @@ -1,9 +1,9 @@ (module snip-wrapper mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred "interface.ss" (prefix sl: "snip-lib.ss") "dllist.ss") diff --git a/collects/embedded-gui/private/stretchable-editor-snip.ss b/collects/embedded-gui/private/stretchable-editor-snip.ss index 313077fd..b295f509 100644 --- a/collects/embedded-gui/private/stretchable-editor-snip.ss +++ b/collects/embedded-gui/private/stretchable-editor-snip.ss @@ -5,9 +5,9 @@ stretchable-editor-snip-mixin) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "interface.ss") diff --git a/collects/embedded-gui/private/suppress-modify-editor.ss b/collects/embedded-gui/private/suppress-modify-editor.ss index efa463b9..e0a3e7f7 100644 --- a/collects/embedded-gui/private/suppress-modify-editor.ss +++ b/collects/embedded-gui/private/suppress-modify-editor.ss @@ -1,9 +1,9 @@ (module suppress-modify-editor mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/etc + mzlib/class + mred) (provide suppress-modify-editor-mixin) diff --git a/collects/embedded-gui/private/tabbable-text.ss b/collects/embedded-gui/private/tabbable-text.ss index 90b2fba1..0daeb419 100644 --- a/collects/embedded-gui/private/tabbable-text.ss +++ b/collects/embedded-gui/private/tabbable-text.ss @@ -2,12 +2,12 @@ (module tabbable-text mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "contract.ss")) + mzlib/class + mzlib/list + mzlib/etc + framework + mred + mzlib/contract) (define tabbable-text<%> (interface () diff --git a/collects/embedded-gui/private/tests/alignment-test.ss b/collects/embedded-gui/private/tests/alignment-test.ss index a3c7f2a7..fd942618 100644 --- a/collects/embedded-gui/private/tests/alignment-test.ss +++ b/collects/embedded-gui/private/tests/alignment-test.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "../verthoriz-alignment.ss" "../lines.ss" "../aligned-pasteboard.ss" diff --git a/collects/embedded-gui/private/tests/not-stetching.ss b/collects/embedded-gui/private/tests/not-stetching.ss index 5d2e7441..1763151a 100644 --- a/collects/embedded-gui/private/tests/not-stetching.ss +++ b/collects/embedded-gui/private/tests/not-stetching.ss @@ -2,9 +2,9 @@ (require (lib "debug.ss" "mike-lib") - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred (lib "aligned-pasteboard.ss" "embedded-gui") (lib "stretchable-editor-snip.ss" "embedded-gui") (lib "verthoriz-alignment.ss" "embedded-gui")) diff --git a/collects/embedded-gui/private/tests/only-one-child.ss b/collects/embedded-gui/private/tests/only-one-child.ss index cb473497..444620ae 100644 --- a/collects/embedded-gui/private/tests/only-one-child.ss +++ b/collects/embedded-gui/private/tests/only-one-child.ss @@ -1,9 +1,9 @@ (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mred + mzlib/class + mzlib/etc + mzlib/list + mzlib/match (prefix a: "../alignment.ss") "../alignment-helpers.ss" "../dllist.ss" diff --git a/collects/embedded-gui/private/tests/peer-stretchables.ss b/collects/embedded-gui/private/tests/peer-stretchables.ss index b76524b7..96833395 100644 --- a/collects/embedded-gui/private/tests/peer-stretchables.ss +++ b/collects/embedded-gui/private/tests/peer-stretchables.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "../stretchable-editor-snip.ss" "../verthoriz-alignment.ss" "../aligned-pasteboard.ss") diff --git a/collects/embedded-gui/private/tests/stretching-in-alignment.ss b/collects/embedded-gui/private/tests/stretching-in-alignment.ss index 1921ee90..0f155a57 100644 --- a/collects/embedded-gui/private/tests/stretching-in-alignment.ss +++ b/collects/embedded-gui/private/tests/stretching-in-alignment.ss @@ -1,13 +1,13 @@ (module stretching-in-alignment mzscheme (require - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss") + mred + mzlib/etc + mzlib/class (lib "interface.ss" "mrlib" "private" "aligned-pasteboard") (lib "debug.ss" "mike-lib") - (lib "list.ss") - (lib "match.ss") + mzlib/list + mzlib/match (prefix a: "alignment.ss") (lib "click-forwarding-editor.ss" "mrlib") (lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard") diff --git a/collects/embedded-gui/private/tests/target-not-object.ss b/collects/embedded-gui/private/tests/target-not-object.ss index 665cf103..1e6ddfb9 100644 --- a/collects/embedded-gui/private/tests/target-not-object.ss +++ b/collects/embedded-gui/private/tests/target-not-object.ss @@ -1,6 +1,6 @@ (require - (lib "class.ss") - (lib "embedded-gui.ss" "embedded-gui")) + mzlib/class + embedded-gui) (let* ([pb (new aligned-pasteboard%)] [interactions (new vertical-alignment% (parent pb))]) diff --git a/collects/embedded-gui/private/tests/test-alignment.ss b/collects/embedded-gui/private/tests/test-alignment.ss index 0ba2d8dd..cfb4679d 100644 --- a/collects/embedded-gui/private/tests/test-alignment.ss +++ b/collects/embedded-gui/private/tests/test-alignment.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/etc + mzlib/list + mzlib/match "../alignment.ss" "test-macro.ss") diff --git a/collects/embedded-gui/private/tests/test-case-box.ss b/collects/embedded-gui/private/tests/test-case-box.ss index c5b9c156..9c2979f3 100644 --- a/collects/embedded-gui/private/tests/test-case-box.ss +++ b/collects/embedded-gui/private/tests/test-case-box.ss @@ -1,16 +1,16 @@ (require - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") - (lib "unitsig.ss") + mzlib/class + mzlib/list + mred + mzlib/unitsig (lib "tool.ss" "drscheme") - (lib "etc.ss") - (lib "match.ss") - (lib "framework.ss" "framework") - (lib "readerr.ss" "syntax") - (lib "string-constant.ss" "string-constants") - (lib "embedded-gui.ss" "embedded-gui") - (lib "string-constant.ss" "string-constants")) + mzlib/etc + mzlib/match + framework + syntax/readerr + string-constants + embedded-gui + string-constants) (define test-case:program-editor% text%) diff --git a/collects/embedded-gui/private/tests/test-macro.ss b/collects/embedded-gui/private/tests/test-macro.ss index a03f5cf2..5bcdc31d 100644 --- a/collects/embedded-gui/private/tests/test-macro.ss +++ b/collects/embedded-gui/private/tests/test-macro.ss @@ -1,6 +1,6 @@ (module test-macro mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide test) diff --git a/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss b/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss index e2f8334d..c86e9126 100644 --- a/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss +++ b/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss @@ -1,6 +1,6 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/class + mred "../aligned-pasteboard.ss" "../verthoriz-alignment.ss" "../snip-wrapper.ss" diff --git a/collects/embedded-gui/private/tests/test-show-feature.ss b/collects/embedded-gui/private/tests/test-show-feature.ss index 3d84bebc..db6b9739 100644 --- a/collects/embedded-gui/private/tests/test-show-feature.ss +++ b/collects/embedded-gui/private/tests/test-show-feature.ss @@ -4,11 +4,11 @@ |# (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mred + mzlib/etc + mzlib/list + mzlib/match (prefix a: "../alignment.ss") "../snip-lib.ss" diff --git a/collects/embedded-gui/private/verthoriz-alignment.ss b/collects/embedded-gui/private/verthoriz-alignment.ss index cd7f1e94..def03e25 100644 --- a/collects/embedded-gui/private/verthoriz-alignment.ss +++ b/collects/embedded-gui/private/verthoriz-alignment.ss @@ -1,10 +1,10 @@ (module verthoriz-alignment mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mzlib/etc + mzlib/list + mzlib/match (prefix a: "alignment.ss") "interface.ss" "alignment-helpers.ss" diff --git a/collects/framework/collapsed-snipclass.ss b/collects/framework/collapsed-snipclass.ss index 4029fd72..f2725335 100644 --- a/collects/framework/collapsed-snipclass.ss +++ b/collects/framework/collapsed-snipclass.ss @@ -1,6 +1,6 @@ (module collapsed-snipclass mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class "private/collapsed-snipclass-helpers.ss") (provide snip-class) diff --git a/collects/framework/comment-snip.ss b/collects/framework/comment-snip.ss index d0f71cde..3a4d1d63 100644 --- a/collects/framework/comment-snip.ss +++ b/collects/framework/comment-snip.ss @@ -1,5 +1,5 @@ (module comment-snip mzscheme - (require (lib "framework.ss" "framework")) + (require framework) (provide (rename comment-box:snipclass snip-class))) diff --git a/collects/framework/decorated-editor-snip.ss b/collects/framework/decorated-editor-snip.ss index 21a0a149..fb3b11a3 100644 --- a/collects/framework/decorated-editor-snip.ss +++ b/collects/framework/decorated-editor-snip.ss @@ -4,8 +4,8 @@ decorated-editor-snipclass% decorated-editor-snip-mixin) - (require (lib "class.ss") - (lib "mred.ss" "mred") + (require mzlib/class + mred "preferences.ss") (define (decorated-editor-snip-mixin super%) diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss index d19c0936..7ce0d4ea 100644 --- a/collects/framework/framework.ss +++ b/collects/framework/framework.ss @@ -1,10 +1,10 @@ (module framework mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-unit.ss" "mred") (lib "mred-sig.ss" "mred") - (lib "mred.ss" "mred") - (lib "class.ss") + mred + mzlib/class "preferences.ss" "test.ss" @@ -14,7 +14,7 @@ "framework-unit.ss" "private/sig.ss" - (lib "contract.ss")) + mzlib/contract) (provide-signature-elements (prefix application: framework:application-class^) diff --git a/collects/framework/gui-utils.ss b/collects/framework/gui-utils.ss index cec9cfa2..bf00eb0f 100644 --- a/collects/framework/gui-utils.ss +++ b/collects/framework/gui-utils.ss @@ -1,10 +1,10 @@ (module gui-utils mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss") - (lib "string-constant.ss" "string-constants")) + (require mzlib/class + mred + mzlib/etc + mzlib/contract + string-constants) (define-syntax (provide/contract/docs stx) (syntax-case stx () diff --git a/collects/framework/keybinding-lang.ss b/collects/framework/keybinding-lang.ss index 88291a9d..ce7bf949 100644 --- a/collects/framework/keybinding-lang.ss +++ b/collects/framework/keybinding-lang.ss @@ -1,14 +1,14 @@ (module keybinding-lang mzscheme - (require (lib "mred.ss" "mred") - (lib "string-constant.ss" "string-constants") - (lib "framework.ss" "framework") - (lib "class.ss")) + (require mred + string-constants + framework + mzlib/class) (provide (rename kl-module-begin #%module-begin) (all-from-except mzscheme #%module-begin) - (all-from (lib "framework.ss" "framework")) - (all-from (lib "mred.ss" "mred")) - (all-from (lib "class.ss"))) + (all-from framework) + (all-from mred) + (all-from mzlib/class)) (define-syntax (kl-module-begin stx) (syntax-case stx () diff --git a/collects/framework/preferences.ss b/collects/framework/preferences.ss index 457f2d78..7b42bc3d 100644 --- a/collects/framework/preferences.ss +++ b/collects/framework/preferences.ss @@ -27,9 +27,9 @@ the state transitions / contracts are: |# (module preferences mzscheme - (require (lib "file.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mzlib/file + mzlib/etc + mzlib/contract) (provide exn:struct:unknown-preference) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index f0b3cde6..4e95bf90 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -1,14 +1,14 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class scheme/file "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "string-constant.ss" "string-constants")) + mzlib/list + string-constants) (import mred^ [prefix exit: framework:exit^] diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index cd680ff0..5f34dc7e 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/collapsed-snipclass-helpers.ss b/collects/framework/private/collapsed-snipclass-helpers.ss index 313a89c2..39e2f6ba 100644 --- a/collects/framework/private/collapsed-snipclass-helpers.ss +++ b/collects/framework/private/collapsed-snipclass-helpers.ss @@ -1,6 +1,6 @@ (module collapsed-snipclass-helpers mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide make-sexp-snipclass%) diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss index df0d7d42..26db84e0 100644 --- a/collects/framework/private/color-model.ss +++ b/collects/framework/private/color-model.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss")) + mzlib/list) (import) (export framework:color-model^) diff --git a/collects/framework/private/color-prefs.ss b/collects/framework/private/color-prefs.ss index 4d2059b1..aa81fd58 100644 --- a/collects/framework/private/color-prefs.ss +++ b/collects/framework/private/color-prefs.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "string-constant.ss" "string-constants") + (require mzlib/class + mzlib/etc + mred + string-constants "../preferences.ss" "sig.ss") diff --git a/collects/framework/private/color.ss b/collects/framework/private/color.ss index 6e31b5c4..59f7771a 100644 --- a/collects/framework/private/color.ss +++ b/collects/framework/private/color.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "thread.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + (require mzlib/class + mzlib/thread + mred + mzlib/etc (lib "token-tree.ss" "syntax-color") (lib "paren-tree.ss" "syntax-color") (lib "default-lexer.ss" "syntax-color") - string-constants/string-constant + string-constants "../preferences.ss" "sig.ss") diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss index 5cc3adc0..3691426f 100644 --- a/collects/framework/private/comment-box.ss +++ b/collects/framework/private/comment-box.ss @@ -1,13 +1,13 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + (require mzlib/class + mzlib/etc + mred "sig.ss" "../decorated-editor-snip.ss" (lib "include-bitmap.ss" "mrlib") - (lib "string-constant.ss" "string-constants")) + string-constants) (import [prefix text: framework:text^] [prefix scheme: framework:scheme^] diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index 2a83d239..e176bc24 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -1,11 +1,11 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "string-constant.ss" "string-constants") + (require mzlib/class + string-constants "sig.ss" "../preferences.ss" "../gui-utils.ss" - (lib "etc.ss") + mzlib/etc (lib "mred-sig.ss" "mred") scheme/path) diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss index e850351e..6edb99c6 100644 --- a/collects/framework/private/exit.ss +++ b/collects/framework/private/exit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") + (require string-constants "sig.ss" "../preferences.ss" "../gui-utils.ss" diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index c71eb1de..8a500f99 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") + (require string-constants "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "string.ss") + mzlib/string scheme/path - (lib "etc.ss")) + mzlib/etc) (import mred^ diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 3ee36437..21f1c5d2 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -1,15 +1,15 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "include.ss") + (require string-constants + mzlib/class + mzlib/include "sig.ss" "../preferences.ss" "../gui-utils.ss" "bday.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") + mzlib/list scheme/path - (lib "etc.ss")) + mzlib/etc) (import mred^ [prefix group: framework:group^] diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss index cf10e2b4..f9601c83 100644 --- a/collects/framework/private/gen-standard-menus.ss +++ b/collects/framework/private/gen-standard-menus.ss @@ -1,7 +1,7 @@ (module gen-standard-menus mzscheme - (require (lib "pretty.ss")) - (require (lib "list.ss")) + (require mzlib/pretty) + (require mzlib/list) (require "standard-menus-items.ss") ;; build-before-super-item-clause : an-item -> (listof clause) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 61e10370..1e973de2 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") + (require string-constants + mzlib/class "sig.ss" "../preferences.ss" "../gui-utils.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") + mzlib/list scheme/path) (import mred^ diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index 08382d17..2bac5c8f 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -1,14 +1,14 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "list.ss") + (require mzlib/class + mzlib/list (lib "hierlist.ss" "hierlist") "sig.ss" "../preferences.ss" "../gui-utils.ss" (lib "mred-sig.ss" "mred") scheme/path - (lib "string-constant.ss" "string-constants")) + string-constants) (import mred^ diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index 058d8685..198cd853 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -1,7 +1,7 @@ #lang scheme/unit (require (for-syntax scheme/base) scheme/promise - (lib "class.ss") + mzlib/class (lib "include-bitmap.ss" "mrlib") "bday.ss" "sig.ss" diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 41a91476..37931480 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -1,11 +1,11 @@ #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "list.ss") +(require string-constants + mzlib/class + mzlib/list (lib "mred-sig.ss" "mred") - (lib "match.ss") + mzlib/match "../preferences.ss" "tex-table.ss" "sig.ss") diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 4eb80fc2..8f051328 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 7e6d1ed0..eae60a29 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/mode.ss b/collects/framework/private/mode.ss index 389ec479..6f70d790 100644 --- a/collects/framework/private/mode.ss +++ b/collects/framework/private/mode.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "surrogate.ss") - (lib "class.ss") + (require mzlib/surrogate + mzlib/class "sig.ss") (import) diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss index 9b8a8ead..58e403ab 100644 --- a/collects/framework/private/number-snip.ss +++ b/collects/framework/private/number-snip.ss @@ -3,9 +3,9 @@ (require "sig.ss" (lib "mred-sig.ss" "mred") - (lib "class.ss") + mzlib/class "../preferences.ss" - (lib "string-constant.ss" "string-constants")) + string-constants) (import mred^) (export (rename framework:number-snip^ diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index 674fa32d..15511244 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -1,10 +1,10 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "etc.ss")) + mzlib/list + mzlib/etc) (import [prefix icon: framework:icon^] mred^) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index 2c65d982..f265d603 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -28,14 +28,14 @@ the state transitions / contracts are: #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") + (require string-constants + mzlib/class scheme/file "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss")) + mzlib/list) (import mred^ [prefix exit: framework:exit^] diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index 6e5f6f9f..cbc53e85 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -3,12 +3,12 @@ #lang scheme/unit (require "collapsed-snipclass-helpers.ss" - (lib "string-constant.ss" "string-constants") - (lib "class.ss") + string-constants + mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "etc.ss") + mzlib/list + mzlib/etc (lib "scheme-lexer.ss" "syntax-color") "../gui-utils.ss" "../preferences.ss") diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index df784741..200b5c49 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -6,20 +6,20 @@ WARNING: printf is rebound in the body of the unit to always |# #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "match.ss") +(require string-constants + mzlib/class + mzlib/match scheme/path "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") (lib "interactive-value-port.ss" "mrlib") - (lib "list.ss") - (lib "etc.ss") - (lib "dirs.ss" "setup") - (lib "string.ss") - (prefix-in srfi1: (lib "1.ss" "srfi"))) + mzlib/list + mzlib/etc + setup/dirs + mzlib/string + (prefix-in srfi1: srfi/1)) (require setup/xref scribble/xref scribble/struct diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss index 5c156bc6..ba68f9b7 100644 --- a/collects/framework/private/version.ss +++ b/collects/framework/private/version.ss @@ -2,8 +2,8 @@ (require "sig.ss" (lib "mred-sig.ss" "mred") - (lib "string.ss") - (lib "list.ss")) + mzlib/string + mzlib/list) (import) (export (rename framework:version^ [-version version])) diff --git a/collects/framework/splash.ss b/collects/framework/splash.ss index 1adf976b..27dfd7ba 100644 --- a/collects/framework/splash.ss +++ b/collects/framework/splash.ss @@ -1,8 +1,8 @@ (module splash mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mzlib/file + mred) (provide get-splash-bitmap set-splash-bitmap @@ -127,8 +127,8 @@ (getenv "PLTDRDEBUG")) (parameterize ([current-namespace (make-namespace)]) (values - (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler) - (dynamic-require '(lib "cm.ss") 'manager-trace-handler))) + (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler) + (dynamic-require 'mzlib/cm 'manager-trace-handler))) (values #f #f))]) (current-load diff --git a/collects/framework/test.ss b/collects/framework/test.ss index 12904cf5..87ac5883 100644 --- a/collects/framework/test.ss +++ b/collects/framework/test.ss @@ -1,9 +1,9 @@ (module test mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/etc + mzlib/contract) (define-syntax (provide/contract/docs stx) (syntax-case stx () diff --git a/collects/hierlist/hierlist-unit.ss b/collects/hierlist/hierlist-unit.ss index a0f53922..c045b9c1 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/hierlist/hierlist-unit.ss @@ -1,14 +1,14 @@ (module hierlist-unit mzscheme - (require (all-except (lib "unit.ss") rename) - (lib "class.ss") - (lib "class100.ss") + (require (all-except mzlib/unit rename) + mzlib/class + mzlib/class100 (lib "mred-sig.ss" "mred") (lib "include-bitmap.ss" "mrlib") "hierlist-sig.ss") - (require (rename (lib "list.ss") sort* sort) - (lib "etc.ss")) + (require (rename mzlib/list sort* sort) + mzlib/etc) (define turn-up (include-bitmap "../icons/turn-up.png" 'png)) (define turn-down (include-bitmap "../icons/turn-down.png" 'png)) diff --git a/collects/hierlist/hierlist.ss b/collects/hierlist/hierlist.ss index 0c802ed5..065f11d0 100644 --- a/collects/hierlist/hierlist.ss +++ b/collects/hierlist/hierlist.ss @@ -1,6 +1,6 @@ (module hierlist mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") (lib "mred-unit.ss" "mred")) diff --git a/collects/mred/edit-main.ss b/collects/mred/edit-main.ss index 2abb1f22..c9280aae 100644 --- a/collects/mred/edit-main.ss +++ b/collects/mred/edit-main.ss @@ -3,7 +3,7 @@ (module edit-main mzscheme (require "edit.ss" - (lib "cmdline.ss")) + mzlib/cmdline) (command-line "Edit" diff --git a/collects/mred/edit.ss b/collects/mred/edit.ss index 01ad9763..334798e5 100644 --- a/collects/mred/edit.ss +++ b/collects/mred/edit.ss @@ -3,9 +3,9 @@ ;; and new-pasteboard-frame (module edit mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss")) + (require mzlib/class + mred + mzlib/etc) (provide new-text-frame new-pasteboard-frame diff --git a/collects/mred/lang/main.ss b/collects/mred/lang/main.ss index cb188c81..e59173cc 100644 --- a/collects/mred/lang/main.ss +++ b/collects/mred/lang/main.ss @@ -1,6 +1,6 @@ (module main mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mred) (provide (all-from mzscheme) - (all-from (lib "class.ss")) - (all-from (lib "mred.ss" "mred")))) + (all-from mzlib/class) + (all-from mred))) diff --git a/collects/mred/mred-unit.ss b/collects/mred/mred-unit.ss index b5d8217d..bb689e21 100644 --- a/collects/mred/mred-unit.ss +++ b/collects/mred/mred-unit.ss @@ -1,5 +1,5 @@ (module mred-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit "mred-sig.ss" "mred.ss") (provide standard-mred@) diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index 9f9bbeeb..35514947 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -4,7 +4,7 @@ namespace-anchor->empty-namespace make-base-empty-namespace) scheme/class - (lib "etc.ss") + mzlib/etc (prefix wx: "private/kernel.ss") "private/wxtop.ss" "private/app.ss" @@ -47,7 +47,7 @@ (define (make-gui-empty-namespace) (let ([ns (make-base-empty-namespace)]) (namespace-attach-module (namespace-anchor->empty-namespace anchor) - 'mred/mred + 'mred ns) ns)) @@ -55,7 +55,7 @@ (let ([ns (make-gui-empty-namespace)]) (parameterize ([current-namespace ns]) (namespace-require 'scheme/base) - (namespace-require 'mred/mred) + (namespace-require 'mred) (namespace-require 'scheme/class)) ns)) diff --git a/collects/mred/private/app.ss b/collects/mred/private/app.ss index 74e6e7df..ac3eaaa0 100644 --- a/collects/mred/private/app.ss +++ b/collects/mred/private/app.ss @@ -1,5 +1,5 @@ (module app mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/check.ss b/collects/mred/private/check.ss index 67771b7b..9872d355 100644 --- a/collects/mred/private/check.ss +++ b/collects/mred/private/check.ss @@ -1,5 +1,5 @@ (module check mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "wx.ss" "const.ss") diff --git a/collects/mred/private/const.ss b/collects/mred/private/const.ss index d19fee21..7964d97a 100644 --- a/collects/mred/private/const.ss +++ b/collects/mred/private/const.ss @@ -1,6 +1,6 @@ (module const mzscheme - (require (lib "class.ss") - (lib "file.ss") + (require mzlib/class + mzlib/file (prefix wx: "kernel.ss")) (provide (protect (all-defined))) diff --git a/collects/mred/private/editor.ss b/collects/mred/private/editor.ss index 0812ed87..0689ab78 100644 --- a/collects/mred/private/editor.ss +++ b/collects/mred/private/editor.ss @@ -1,9 +1,9 @@ (module editor mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "file.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list + mzlib/file (prefix wx: "kernel.ss") "seqcontract.ss" "lock.ss" diff --git a/collects/mred/private/filedialog.ss b/collects/mred/private/filedialog.ss index 25a4efc1..8b2e4229 100644 --- a/collects/mred/private/filedialog.ss +++ b/collects/mred/private/filedialog.ss @@ -1,7 +1,7 @@ (module filedialog mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/fontdialog.ss b/collects/mred/private/fontdialog.ss index 15d46aa2..2b600d87 100644 --- a/collects/mred/private/fontdialog.ss +++ b/collects/mred/private/fontdialog.ss @@ -1,7 +1,7 @@ (module fontdialog mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/gdi.ss b/collects/mred/private/gdi.ss index e2546519..be4426a3 100644 --- a/collects/mred/private/gdi.ss +++ b/collects/mred/private/gdi.ss @@ -1,7 +1,7 @@ (module gdi mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "check.ss" diff --git a/collects/mred/private/helper.ss b/collects/mred/private/helper.ss index b938d138..8f7ad665 100644 --- a/collects/mred/private/helper.ss +++ b/collects/mred/private/helper.ss @@ -1,5 +1,5 @@ (module helper mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss") diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index c6807f4d..3c475972 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -3,7 +3,7 @@ ;; kernel.ss is generated by a target in /mred/wxs/Makefile. (module kernel mzscheme - (require (all-except (lib "class.ss") object%)) + (require (all-except mzlib/class object%)) ;; Pull pieces out of #%mred-kernel dynamically, so that ;; the library compiles with setup-plt in mzscheme. diff --git a/collects/mred/private/messagebox.ss b/collects/mred/private/messagebox.ss index 4b08a7ca..21c87144 100644 --- a/collects/mred/private/messagebox.ss +++ b/collects/mred/private/messagebox.ss @@ -1,8 +1,8 @@ (module messagebox mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "string.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/string (prefix wx: "kernel.ss") "const.ss" "check.ss" diff --git a/collects/mred/private/misc.ss b/collects/mred/private/misc.ss index f1d959c7..62f71937 100644 --- a/collects/mred/private/misc.ss +++ b/collects/mred/private/misc.ss @@ -1,7 +1,7 @@ (module misc mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "process.ss") + (require mzlib/class + mzlib/file + mzlib/process (prefix wx: "kernel.ss")) (provide file-creator-and-type diff --git a/collects/mred/private/moredialogs.ss b/collects/mred/private/moredialogs.ss index 96038289..1dc8b881 100644 --- a/collects/mred/private/moredialogs.ss +++ b/collects/mred/private/moredialogs.ss @@ -1,7 +1,7 @@ (module moredialogs mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrcanvas.ss b/collects/mred/private/mrcanvas.ss index b7ca0605..0d339c66 100644 --- a/collects/mred/private/mrcanvas.ss +++ b/collects/mred/private/mrcanvas.ss @@ -1,7 +1,7 @@ (module mrcanvas mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrcontainer.ss b/collects/mred/private/mrcontainer.ss index 21f38ce6..44d584c2 100644 --- a/collects/mred/private/mrcontainer.ss +++ b/collects/mred/private/mrcontainer.ss @@ -1,7 +1,7 @@ (module mrcontainer mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index 3e05e328..b2f5f3f2 100644 --- a/collects/mred/private/mritem.ss +++ b/collects/mred/private/mritem.ss @@ -1,7 +1,7 @@ (module mritem mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrmenu.ss b/collects/mred/private/mrmenu.ss index bf531e12..4b079b48 100644 --- a/collects/mred/private/mrmenu.ss +++ b/collects/mred/private/mrmenu.ss @@ -1,7 +1,7 @@ (module mrmenu mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrmenuintf.ss b/collects/mred/private/mrmenuintf.ss index e4c4d400..4dc17d5c 100644 --- a/collects/mred/private/mrmenuintf.ss +++ b/collects/mred/private/mrmenuintf.ss @@ -1,5 +1,5 @@ (module mrmenuintf mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide menu-item<%> labelled-menu-item<%> diff --git a/collects/mred/private/mrpanel.ss b/collects/mred/private/mrpanel.ss index f557e882..0de38cea 100644 --- a/collects/mred/private/mrpanel.ss +++ b/collects/mred/private/mrpanel.ss @@ -1,6 +1,6 @@ (module mrpanel mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrpopup.ss b/collects/mred/private/mrpopup.ss index dfa3d2ff..b9b7f77e 100644 --- a/collects/mred/private/mrpopup.ss +++ b/collects/mred/private/mrpopup.ss @@ -1,7 +1,7 @@ (module mrpopup mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrtextfield.ss b/collects/mred/private/mrtextfield.ss index 56c500dc..179b9b46 100644 --- a/collects/mred/private/mrtextfield.ss +++ b/collects/mred/private/mrtextfield.ss @@ -1,7 +1,7 @@ (module mrtextfield mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrtop.ss b/collects/mred/private/mrtop.ss index 9b3fe5c6..ef591530 100644 --- a/collects/mred/private/mrtop.ss +++ b/collects/mred/private/mrtop.ss @@ -1,8 +1,8 @@ (module mrtop mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/mrwindow.ss b/collects/mred/private/mrwindow.ss index 63b466d9..6572640e 100644 --- a/collects/mred/private/mrwindow.ss +++ b/collects/mred/private/mrwindow.ss @@ -1,6 +1,6 @@ (module mrwindow mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/path-dialog.ss b/collects/mred/private/path-dialog.ss index 4c5d5957..9b7c73e5 100644 --- a/collects/mred/private/path-dialog.ss +++ b/collects/mred/private/path-dialog.ss @@ -1,5 +1,5 @@ (module path-dialog mzscheme - (require (lib "class.ss") (lib "list.ss") (lib "string.ss") (lib "file.ss") + (require mzlib/class mzlib/list mzlib/string mzlib/file (prefix wx: "kernel.ss") "helper.ss" "mrtop.ss" "mritem.ss" "mrpanel.ss" "mrtextfield.ss" "messagebox.ss" "mrmenu.ss") diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss index 96aaea9e..d01f8bab 100644 --- a/collects/mred/private/repl.ss +++ b/collects/mred/private/repl.ss @@ -1,6 +1,6 @@ (module repl mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "editor.ss" "app.ss" diff --git a/collects/mred/private/seqcontract.ss b/collects/mred/private/seqcontract.ss index 7dde1ab5..c16fd39c 100644 --- a/collects/mred/private/seqcontract.ss +++ b/collects/mred/private/seqcontract.ss @@ -1,9 +1,9 @@ (module seqcontract mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide (protect es-contract-mixin lock-contract-mixin)) - (require-for-syntax (lib "stx.ss" "syntax") - (lib "boundmap.ss" "syntax")) + (require-for-syntax syntax/stx + syntax/boundmap) (define-syntax (sequence-contract-mixin stx) (syntax-case stx (state-machine) diff --git a/collects/mred/private/snipfile.ss b/collects/mred/private/snipfile.ss index d5558d13..95399bb9 100644 --- a/collects/mred/private/snipfile.ss +++ b/collects/mred/private/snipfile.ss @@ -1,8 +1,8 @@ (module snipfile mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "port.ss") - (lib "moddep.ss" "syntax") + (require mzlib/class + mzlib/etc + mzlib/port + syntax/moddep (prefix wx: "kernel.ss") "check.ss" "editor.ss") diff --git a/collects/mred/private/wx.ss b/collects/mred/private/wx.ss index dda7ef3f..992d201f 100644 --- a/collects/mred/private/wx.ss +++ b/collects/mred/private/wx.ss @@ -1,6 +1,6 @@ (module wx mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss") diff --git a/collects/mred/private/wxcanvas.ss b/collects/mred/private/wxcanvas.ss index 16e549bc..67889f13 100644 --- a/collects/mred/private/wxcanvas.ss +++ b/collects/mred/private/wxcanvas.ss @@ -1,6 +1,6 @@ (module wxcanvas mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxcontainer.ss b/collects/mred/private/wxcontainer.ss index bb823a26..29efe525 100644 --- a/collects/mred/private/wxcontainer.ss +++ b/collects/mred/private/wxcontainer.ss @@ -1,7 +1,7 @@ (module wxcontainer mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxitem.ss b/collects/mred/private/wxitem.ss index afa41d91..fe6497cb 100644 --- a/collects/mred/private/wxitem.ss +++ b/collects/mred/private/wxitem.ss @@ -1,8 +1,8 @@ (module wxitem mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "file.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/file (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxmenu.ss b/collects/mred/private/wxmenu.ss index 975a5314..91c34e9a 100644 --- a/collects/mred/private/wxmenu.ss +++ b/collects/mred/private/wxmenu.ss @@ -1,7 +1,7 @@ (module wxmenu mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxpanel.ss b/collects/mred/private/wxpanel.ss index 5b4349ca..2eaa512b 100644 --- a/collects/mred/private/wxpanel.ss +++ b/collects/mred/private/wxpanel.ss @@ -1,7 +1,7 @@ (module wxpanel mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxtextfield.ss b/collects/mred/private/wxtextfield.ss index 3f5af68a..6bce6bfa 100644 --- a/collects/mred/private/wxtextfield.ss +++ b/collects/mred/private/wxtextfield.ss @@ -1,6 +1,6 @@ (module wxtextfield mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxtop.ss b/collects/mred/private/wxtop.ss index 2427d11f..c0a2c54a 100644 --- a/collects/mred/private/wxtop.ss +++ b/collects/mred/private/wxtop.ss @@ -1,8 +1,8 @@ (module wxtop mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxwindow.ss b/collects/mred/private/wxwindow.ss index 88e5ed75..a05e0c47 100644 --- a/collects/mred/private/wxwindow.ss +++ b/collects/mred/private/wxwindow.ss @@ -1,6 +1,6 @@ (module wxwindow mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mrlib/bitmap-label.ss b/collects/mrlib/bitmap-label.ss index 5e23180d..1d6a988d 100644 --- a/collects/mrlib/bitmap-label.ss +++ b/collects/mrlib/bitmap-label.ss @@ -1,8 +1,8 @@ (module bitmap-label mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/etc + mzlib/contract) (provide/contract [make-bitmap-label (opt-> diff --git a/collects/mrlib/cache-image-snip.ss b/collects/mrlib/cache-image-snip.ss index 19e9bbb6..683505ba 100644 --- a/collects/mrlib/cache-image-snip.ss +++ b/collects/mrlib/cache-image-snip.ss @@ -1,9 +1,9 @@ (module cache-image-snip mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "string.ss") - (lib "contract.ss") - (lib "list.ss")) + (require mred + mzlib/class + mzlib/string + mzlib/contract + mzlib/list) (provide cache-image-snip% cache-image-snip-class% diff --git a/collects/mrlib/click-forwarding-editor.ss b/collects/mrlib/click-forwarding-editor.ss index eaedaa87..5e9afe50 100644 --- a/collects/mrlib/click-forwarding-editor.ss +++ b/collects/mrlib/click-forwarding-editor.ss @@ -1,10 +1,10 @@ (module click-forwarding-editor mzscheme (require - (lib "class.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/contract + mzlib/etc + mred) (provide/contract (click-forwarding-editor-mixin mixin-contract)) diff --git a/collects/mrlib/gif.ss b/collects/mrlib/gif.ss index 19bad3e7..6a05e77d 100644 --- a/collects/mrlib/gif.ss +++ b/collects/mrlib/gif.ss @@ -1,12 +1,12 @@ (module gif mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "gifwrite.ss" "net") - (lib "contract.ss") - (lib "kw.ss") - (lib "etc.ss")) + (require mzlib/class + mzlib/file + mred + net/gifwrite + mzlib/contract + mzlib/kw + mzlib/etc) (provide write-gif write-animated-gif) diff --git a/collects/mrlib/graph.ss b/collects/mrlib/graph.ss index dd1013b6..2ed73337 100644 --- a/collects/mrlib/graph.ss +++ b/collects/mrlib/graph.ss @@ -1,10 +1,10 @@ (module graph mzscheme - (require (lib "class.ss") - (lib "list.ss") - (lib "math.ss") - (lib "mred.ss" "mred") - (lib "contract.ss")) + (require mzlib/class + mzlib/list + mzlib/math + mred + mzlib/contract) (provide graph-snip<%> graph-snip-mixin diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss index 3fb2ea4b..c4f23ac9 100644 --- a/collects/mrlib/include-bitmap.ss +++ b/collects/mrlib/include-bitmap.ss @@ -1,10 +1,10 @@ (module include-bitmap mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "file.ss") + (require mred + mzlib/class + mzlib/file (lib "main-collects.ss" "setup")) - (require-for-syntax (lib "path-spec.ss" "syntax") - (lib "cm-accomplice.ss") + (require-for-syntax syntax/path-spec + mzlib/cm-accomplice (lib "main-collects.ss" "setup")) (provide include-bitmap diff --git a/collects/mrlib/interactive-value-port.ss b/collects/mrlib/interactive-value-port.ss index 9c76fedc..bb8eb950 100644 --- a/collects/mrlib/interactive-value-port.ss +++ b/collects/mrlib/interactive-value-port.ss @@ -1,8 +1,8 @@ (module interactive-value-port mzscheme - (require (lib "pretty.ss") - (lib "mred.ss" "mred") - (lib "class.ss") + (require mzlib/pretty + mred + mzlib/class "syntax-browser.ss") (provide set-interactive-display-handler set-interactive-write-handler diff --git a/collects/mrlib/matrix-snip.ss b/collects/mrlib/matrix-snip.ss index 310a7d08..d4276214 100644 --- a/collects/mrlib/matrix-snip.ss +++ b/collects/mrlib/matrix-snip.ss @@ -1,7 +1,7 @@ #lang scheme -(require (lib "class.ss") - (lib "string.ss") +(require mzlib/class + mzlib/string (lib "cache-image-snip.ss" "mrlib")) (provide visible-matrix% diff --git a/collects/mrlib/plot.ss b/collects/mrlib/plot.ss index 379c6c42..ad3a1928 100644 --- a/collects/mrlib/plot.ss +++ b/collects/mrlib/plot.ss @@ -1,7 +1,7 @@ (module plot mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/contract) (define-struct data-set (points connected? pen min-x max-x min-y max-y)) diff --git a/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss b/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss index e813d4f3..f043cef9 100644 --- a/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss +++ b/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss @@ -1,10 +1,10 @@ (module aligned-editor-container mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "snip-lib.ss" "interface.ss" "constants.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/alignment.ss b/collects/mrlib/private/aligned-pasteboard/alignment.ss index 3861ea5e..1e5b78f5 100644 --- a/collects/mrlib/private/aligned-pasteboard/alignment.ss +++ b/collects/mrlib/private/aligned-pasteboard/alignment.ss @@ -23,10 +23,10 @@ neck and it is the most readable solution. (module alignment mzscheme (require - (lib "match.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/match + mzlib/contract + mzlib/etc + mzlib/list) (define-struct rect (x y)) (define-struct abs-rect (ondim offdim)) diff --git a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss index f27ab4da..37b74e60 100644 --- a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss @@ -1,12 +1,12 @@ (module geometry-managed-pasteboard mzscheme (require - (lib "class.ss") - (lib "contract.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "match.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/contract + mzlib/list + mzlib/etc + mzlib/match + mred "aligned-editor-container.ss" "interface.ss" "alignment.ss" diff --git a/collects/mrlib/private/aligned-pasteboard/interface.ss b/collects/mrlib/private/aligned-pasteboard/interface.ss index c783ad35..b4de7aea 100644 --- a/collects/mrlib/private/aligned-pasteboard/interface.ss +++ b/collects/mrlib/private/aligned-pasteboard/interface.ss @@ -1,8 +1,8 @@ (module interface mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide aligned-pasteboard<%> diff --git a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss index 365aa734..3d10d682 100644 --- a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss @@ -5,10 +5,10 @@ (module locked-pasteboard mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss")) + mzlib/class + mred + mzlib/etc + mzlib/contract) (provide/contract (locked-pasteboard-mixin mixin-contract)) diff --git a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss index 00837794..50d1ddfc 100644 --- a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss @@ -1,10 +1,10 @@ (module pasteboard-lib mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "contract.ss") - (lib "etc.ss") + mzlib/class + mred + mzlib/contract + mzlib/etc "interface.ss" "snip-lib.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/snip-lib.ss b/collects/mrlib/private/aligned-pasteboard/snip-lib.ss index 266a0a63..2a5fd19c 100644 --- a/collects/mrlib/private/aligned-pasteboard/snip-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/snip-lib.ss @@ -1,11 +1,11 @@ (module snip-lib mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "contract.ss") + mzlib/class + mzlib/etc + mred + mzlib/list + mzlib/contract "interface.ss") ;; a snip diff --git a/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss b/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss index 06bfccf1..2e609383 100644 --- a/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss +++ b/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss @@ -5,9 +5,9 @@ stretchable-editor-snip-mixin) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "snip-lib.ss" "interface.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss b/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss index 84ac771c..9541d965 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss b/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss index a30f7b9c..93af93eb 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss @@ -1,9 +1,9 @@ ;; some more advanced aligned-pasteboard tests take from the test-case-boxes (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-editor-container.ss" "../aligned-pasteboard.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss index bd68233e..d08e056b 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/etc + mzlib/list + mzlib/match "../alignment.ss" "test-macro.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss index ef99509f..ce54b64a 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss @@ -1,8 +1,8 @@ (require - (lib "etc.ss") - (lib "class.ss") + mzlib/etc + mzlib/class "test-macro.ss" - (lib "mred.ss" "mred") + mred "../pasteboard-lib.ss" "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss index 0eb51b2c..1d1e7944 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred "../snip-lib.ss" "../aligned-pasteboard.ss" "../aligned-editor-container.ss" diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test.ss b/collects/mrlib/private/aligned-pasteboard/tests/test.ss index 168701cf..43cb2c61 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test.ss @@ -1,8 +1,8 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "../aligned-pasteboard.ss" "../aligned-editor-container.ss" "snip-dumper.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test2.ss b/collects/mrlib/private/aligned-pasteboard/tests/test2.ss index 6d81df05..10151a47 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test2.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test2.ss @@ -1,8 +1,8 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "../aligned-pasteboard.ss" "../aligned-editor-container.ss" "snip-dumper.ss") diff --git a/collects/mrlib/syntax-browser.ss b/collects/mrlib/syntax-browser.ss index 7f6bdf93..6cfc5f2f 100644 --- a/collects/mrlib/syntax-browser.ss +++ b/collects/mrlib/syntax-browser.ss @@ -7,12 +7,12 @@ needed to really make this work: |# (module syntax-browser scheme/base - (require (lib "pretty.ss") - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "match.ss") - (lib "string.ss") + (require mzlib/pretty + mzlib/list + mzlib/class + mred + mzlib/match + mzlib/string "include-bitmap.ss") (define orig-output-port (current-output-port)) diff --git a/collects/mrlib/tab-choice.ss b/collects/mrlib/tab-choice.ss index 3c90bd48..32ed3761 100644 --- a/collects/mrlib/tab-choice.ss +++ b/collects/mrlib/tab-choice.ss @@ -5,9 +5,9 @@ ;; -- The copy in framework should be removed -- (module tab-choice mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "list.ss")) + (require mzlib/class + mred + mzlib/list) (provide auto-tab-panel% single<%> single-mixin) diff --git a/collects/mrlib/text-string-style-desc.ss b/collects/mrlib/text-string-style-desc.ss index a1929ef6..d8c1afe5 100644 --- a/collects/mrlib/text-string-style-desc.ss +++ b/collects/mrlib/text-string-style-desc.ss @@ -1,8 +1,8 @@ (module text-string-style-desc mzscheme (provide get-string/style-desc) - (require (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss")) + (require mred + mzlib/etc + mzlib/class) ;; get-string/style-desc : text -> (listof str/ann) (define get-string/style-desc diff --git a/collects/scribblings/gui/gui.scrbl b/collects/scribblings/gui/gui.scrbl index 716310d5..57ee3cba 100644 --- a/collects/scribblings/gui/gui.scrbl +++ b/collects/scribblings/gui/gui.scrbl @@ -3,7 +3,7 @@ @title{@bold{GUI}: PLT Graphics Toolkit} -@declare-exporting[scheme/gui/base scheme/gui #:use-sources (mred/mred)] +@declare-exporting[scheme/gui/base scheme/gui #:use-sources (mred)] This reference manual describes the GUI toolbox that is part of PLT Scheme and whose core is implemented by the MrEd executable. diff --git a/collects/tests/aligned-pasteboard/debug.ss b/collects/tests/aligned-pasteboard/debug.ss index d13734ea..192327a1 100644 --- a/collects/tests/aligned-pasteboard/debug.ss +++ b/collects/tests/aligned-pasteboard/debug.ss @@ -1,6 +1,6 @@ (module debug mzscheme (require - (lib "class.ss")) + mzlib/class) (provide debug-snip diff --git a/collects/tests/aligned-pasteboard/example.ss b/collects/tests/aligned-pasteboard/example.ss index d9fe843e..9bff9816 100644 --- a/collects/tests/aligned-pasteboard/example.ss +++ b/collects/tests/aligned-pasteboard/example.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/tests/aligned-pasteboard/snip-dumper.ss b/collects/tests/aligned-pasteboard/snip-dumper.ss index 8fdd8f68..00d3b40b 100644 --- a/collects/tests/aligned-pasteboard/snip-dumper.ss +++ b/collects/tests/aligned-pasteboard/snip-dumper.ss @@ -1,8 +1,8 @@ (module snip-dumper mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide dump-children diff --git a/collects/tests/framework/framework-test-engine.ss b/collects/tests/framework/framework-test-engine.ss index c09732f0..ea5da91c 100644 --- a/collects/tests/framework/framework-test-engine.ss +++ b/collects/tests/framework/framework-test-engine.ss @@ -1,7 +1,7 @@ (module framework-test-engine mzscheme - (require (lib "pconvert.ss") - (lib "mred.ss" "mred") + (require mzlib/pconvert + mred "debug.ss") (define errs null) diff --git a/collects/tests/framework/keys.ss b/collects/tests/framework/keys.ss index c3887094..f71dab64 100644 --- a/collects/tests/framework/keys.ss +++ b/collects/tests/framework/keys.ss @@ -1,6 +1,6 @@ (module keys mzscheme (require "test-suite-utils.ss") - (require (lib "include.ss")) + (require mzlib/include) (test 'keymap:aug-keymap%/get-table diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss index 9a972a40..13782cc5 100644 --- a/collects/tests/framework/load.ss +++ b/collects/tests/framework/load.ss @@ -7,12 +7,10 @@ (test (string->symbol file) void? - `(let ([mred-name - ((current-module-name-resolver) '(lib "mred.ss" "mred") #f #f)] + `(let ([mred-name ((current-module-name-resolver) 'mred #f #f)] [orig-namespace (current-namespace)]) (parameterize ([current-namespace (make-namespace)]) - (namespace-attach-module - orig-namespace mred-name) + (namespace-attach-module orig-namespace mred-name) (eval '(require (lib ,file "framework"))) (with-handlers ([(lambda (x) #t) (lambda (x) @@ -26,7 +24,7 @@ (test/load "gui-utils.ss" 'gui-utils:next-untitled-name) (test/load "test.ss" 'test:run-interval) (test/load "splash.ss" 'start-splash) - (test/load "framework-sig.ss" '(begin (eval '(require (lib "unit.ss"))) + (test/load "framework-sig.ss" '(begin (eval '(require mzlib/unit)) (eval '(define-signature dummy-signature^ ((open framework^)))))) (test/load "framework-unit.ss" 'framework@) (test/load "framework.ss" '(list test:button-push @@ -34,14 +32,14 @@ frame:basic-mixin)) ;; ensures that all of the names in the signature are provided - ;; by (require (lib "framework.ss" "framework")) + ;; by (require framework) (test/load "framework.ss" ;; these extra evals let me submit multiple, independent top-level ;; expressions in the newly created namespace. - '(begin (eval '(require (lib "unit.ss"))) + '(begin (eval '(require mzlib/unit)) (eval '(require-for-syntax mzscheme)) - (eval '(require-for-syntax (lib "unit-exptime.ss"))) + (eval '(require-for-syntax mzlib/unit-exptime)) (eval '(define-syntax (signature->symbols stx) (syntax-case stx () [(_ sig) diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss index 485d81fc..90831f74 100644 --- a/collects/tests/framework/main.ss +++ b/collects/tests/framework/main.ss @@ -1,8 +1,8 @@ (module main mzscheme - (require (lib "launcher.ss" "launcher") - (lib "cmdline.ss") - (lib "list.ss") - (lib "unitsig.ss") + (require launcher + mzlib/cmdline + mzlib/list + mzlib/unitsig "debug.ss" "test-suite-utils.ss") diff --git a/collects/tests/framework/prefs.ss b/collects/tests/framework/prefs.ss index f45bc97d..52980d16 100644 --- a/collects/tests/framework/prefs.ss +++ b/collects/tests/framework/prefs.ss @@ -1,7 +1,7 @@ (module prefs mzscheme (require "test-suite-utils.ss" - (lib "etc.ss") - (lib "list.ss")) + mzlib/etc + mzlib/list) (define ((check-eq? x) y) (eq? x y)) (define pref-sym 'plt:not-a-real-preference) diff --git a/collects/tests/framework/test-suite-utils.ss b/collects/tests/framework/test-suite-utils.ss index 4b17c702..8f65d4cc 100644 --- a/collects/tests/framework/test-suite-utils.ss +++ b/collects/tests/framework/test-suite-utils.ss @@ -1,9 +1,9 @@ (module test-suite-utils mzscheme - (require (lib "launcher.ss" "launcher") - (lib "pretty.ss") - (lib "list.ss") - (lib "process.ss") + (require launcher + mzlib/pretty + mzlib/list + mzlib/process "debug.ss") (provide @@ -110,8 +110,8 @@ (set! out-port out)) (when load-framework-automatically? (queue-sexp-to-mred - '(begin (eval '(require (lib "framework.ss" "framework"))) - (eval '(require (lib "gui.ss" "tests" "utils"))))))) + '(begin (eval '(require framework)) + (eval '(require tests/utils/gui)))))) (define load-framework-automatically (case-lambda diff --git a/collects/tests/mred/dc.ss b/collects/tests/mred/dc.ss index 8463ba1b..217f14e3 100644 --- a/collects/tests/mred/dc.ss +++ b/collects/tests/mred/dc.ss @@ -75,7 +75,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Get-pixel, set-pixel, get-argb-pixels, etc. -(require (lib "etc.ss")) +(require mzlib/etc) (define (pixel-tests b&w?) (begin-with-definitions diff --git a/collects/tests/mred/item.ss b/collects/tests/mred/item.ss index 4abeaf78..cfe7a5f7 100644 --- a/collects/tests/mred/item.ss +++ b/collects/tests/mred/item.ss @@ -1,9 +1,9 @@ #lang scheme/gui -(require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss")) +(require mzlib/class + mzlib/class100 + mzlib/etc) (define my-txt #f) (define my-lb #f) diff --git a/collects/tests/mred/mem.ss b/collects/tests/mred/mem.ss index 7b25821c..4d0f8150 100644 --- a/collects/tests/mred/mem.ss +++ b/collects/tests/mred/mem.ss @@ -1,7 +1,7 @@ ; run with mred -u -- -f mem.ss -(require (lib "class100.ss")) +(require mzlib/class100) (define source-dir (current-load-relative-directory)) diff --git a/collects/tests/mred/png.ss b/collects/tests/mred/png.ss index f232e6d4..aa48ac47 100644 --- a/collects/tests/mred/png.ss +++ b/collects/tests/mred/png.ss @@ -1,4 +1,4 @@ -(require (lib "list.ss")) +(require mzlib/list) (define png-suite (build-path (or (current-load-relative-directory) (current-directory)) diff --git a/collects/tests/mred/testing.ss b/collects/tests/mred/testing.ss index 18a7f411..d5e56227 100644 --- a/collects/tests/mred/testing.ss +++ b/collects/tests/mred/testing.ss @@ -1,7 +1,7 @@ ;; MrEd automatic testing basic functions and macros -(require (lib "class.ss")) +(require mzlib/class) (define SECTION #t) diff --git a/collects/tests/mzscheme/cache-image-snip-test.ss b/collects/tests/mzscheme/cache-image-snip-test.ss index 833a68f0..63bc50a6 100644 --- a/collects/tests/mzscheme/cache-image-snip-test.ss +++ b/collects/tests/mzscheme/cache-image-snip-test.ss @@ -1,7 +1,7 @@ (load-relative "loadtest.ss") (require (lib "cache-image-snip.ss" "mrlib") - (lib "unit.ss")) + mzlib/unit) (invoke-unit (unit diff --git a/collects/tests/utils/gui.ss b/collects/tests/utils/gui.ss index e78883f6..a01943dd 100644 --- a/collects/tests/utils/gui.ss +++ b/collects/tests/utils/gui.ss @@ -1,7 +1,7 @@ (module gui mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss")) + (require mred + mzlib/class + mzlib/etc) (provide find-labelled-window whitespace-string=?) ;; whitespace-string=? : string string -> boolean