From 2fabbcf66db8a9a6dd8333246b27998fa5d02efa Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 9 Jul 2008 07:18:06 +0000 Subject: [PATCH] * Newlines at EOFs * Another big chunk of v4-require-isms * Allow `#lang framework/keybinding-lang' for keybinding files * Move hierlist sources into "mrlib/hierlist", leave stub behind svn: r10689 original commit: 7d50e61c7f6831936e13e6af5140db65db18fe1c --- .../private/aligned-pasteboard.ss | 8 ++++---- collects/embedded-gui/private/button-snip.ss | 4 ++-- .../embedded-gui/private/grid-alignment.ss | 2 +- .../private/tests/not-stetching.ss | 8 ++++---- .../private/tests/only-one-child.ss | 2 +- .../private/tests/stretching-in-alignment.ss | 12 +++++------ .../private/tests/test-case-box.ss | 2 +- .../private/tests/test-show-feature.ss | 4 ++-- .../tests/unaligned-childless-redux.ss | 4 ++-- collects/framework/framework-unit.ss | 4 ++-- collects/framework/gui-utils.ss | 2 +- collects/framework/main.ss | 4 ++-- collects/framework/private/autosave.ss | 2 +- collects/framework/private/bday.ss | 2 +- collects/framework/private/canvas.ss | 2 +- collects/framework/private/color-model.ss | 2 +- collects/framework/private/comment-box.ss | 4 ++-- collects/framework/private/editor.ss | 2 +- collects/framework/private/exit.ss | 2 +- collects/framework/private/finder.ss | 2 +- collects/framework/private/frame.ss | 2 +- .../framework/private/gen-standard-menus.ss | 2 +- collects/framework/private/group.ss | 2 +- collects/framework/private/handler.ss | 5 ++--- collects/framework/private/icon.ss | 20 +++++++++---------- collects/framework/private/keymap.ss | 7 +++++-- collects/framework/private/main.ss | 2 +- collects/framework/private/mapdesc.ss | 1 - collects/framework/private/menu.ss | 2 +- collects/framework/private/number-snip.ss | 2 +- collects/framework/private/panel.ss | 2 +- collects/framework/private/pasteboard.ss | 9 ++++----- collects/framework/private/path-utils.ss | 3 +-- collects/framework/private/preferences.ss | 2 +- .../framework/private/standard-menus-items.ss | 2 +- collects/framework/private/text.ss | 4 ++-- collects/framework/private/version.ss | 2 +- collects/hierlist/hierlist.ss | 2 ++ collects/mrlib/hierlist.ss | 6 +++--- collects/{ => mrlib}/hierlist/hierlist-sig.ss | 0 .../{ => mrlib}/hierlist/hierlist-unit.ss | 18 ++++++++--------- collects/mrlib/include-bitmap.ss | 4 ++-- collects/mrlib/matrix-snip.ss | 2 +- collects/mrlib/path-dialog.ss | 2 +- .../aligned-pasteboard/aligned-pasteboard.ss | 2 +- .../tests/insertion-without-display.ss | 2 +- .../tests/test-locked-pasteboard.ss | 2 +- collects/mrlib/syntax-browser.ss | 8 ++++---- collects/tests/framework/load.ss | 2 +- .../tests/mzscheme/cache-image-snip-test.ss | 2 +- 50 files changed, 98 insertions(+), 97 deletions(-) rename collects/{ => mrlib}/hierlist/hierlist-sig.ss (100%) rename collects/{ => mrlib}/hierlist/hierlist-unit.ss (98%) diff --git a/collects/embedded-gui/private/aligned-pasteboard.ss b/collects/embedded-gui/private/aligned-pasteboard.ss index e2aa618c..363b9d27 100644 --- a/collects/embedded-gui/private/aligned-pasteboard.ss +++ b/collects/embedded-gui/private/aligned-pasteboard.ss @@ -5,21 +5,21 @@ |# (module aligned-pasteboard mzscheme - + (provide aligned-pasteboard%) - + (require mzlib/class mred mzlib/etc - (lib "click-forwarding-editor.ss" "mrlib") + mrlib/click-forwarding-editor "on-show-pasteboard.ss" "really-resized-pasteboard.ss" "interface.ss" "locked-pasteboard.ss" "suppress-modify-editor.ss" "on-show-editor.ss") - + (define aligned-pasteboard% (class* (click-forwarding-editor-mixin (suppress-modify-editor-mixin diff --git a/collects/embedded-gui/private/button-snip.ss b/collects/embedded-gui/private/button-snip.ss index 66dcda3d..45812d80 100644 --- a/collects/embedded-gui/private/button-snip.ss +++ b/collects/embedded-gui/private/button-snip.ss @@ -205,8 +205,8 @@ ;; tests #| (require - (lib "locked-pasteboard.ss" "mrlib" "private" "aligned-pasteboard") - (lib "click-forwarding-editor.ss" "mrlib")) + mrlib/private/aligned-pasteboard/locked-pasteboard + mrlib/click-forwarding-editor) (define (test) (define f (new frame% (label "test") (width 200) (height 200))) diff --git a/collects/embedded-gui/private/grid-alignment.ss b/collects/embedded-gui/private/grid-alignment.ss index 47933e34..0dce40df 100644 --- a/collects/embedded-gui/private/grid-alignment.ss +++ b/collects/embedded-gui/private/grid-alignment.ss @@ -13,7 +13,7 @@ mzlib/list mzlib/match (prefix a: "alignment.ss") - (lib "click-forwarding-editor.ss" "mrlib") + mrlib/click-forwarding-editor "on-show-pasteboard.ss" "really-resized-pasteboard.ss" diff --git a/collects/embedded-gui/private/tests/not-stetching.ss b/collects/embedded-gui/private/tests/not-stetching.ss index 1763151a..ace952c9 100644 --- a/collects/embedded-gui/private/tests/not-stetching.ss +++ b/collects/embedded-gui/private/tests/not-stetching.ss @@ -1,13 +1,13 @@ (module not-stetching mzscheme (require - (lib "debug.ss" "mike-lib") + mike-lib/debug mzlib/class mzlib/etc mred - (lib "aligned-pasteboard.ss" "embedded-gui") - (lib "stretchable-editor-snip.ss" "embedded-gui") - (lib "verthoriz-alignment.ss" "embedded-gui")) + embedded-gui/aligned-pasteboard + embedded-gui/stretchable-editor-snip + embedded-gui/verthoriz-alignment) (define traced-ses% #;(override/trace stretchable-editor-snip% diff --git a/collects/embedded-gui/private/tests/only-one-child.ss b/collects/embedded-gui/private/tests/only-one-child.ss index 444620ae..260839bc 100644 --- a/collects/embedded-gui/private/tests/only-one-child.ss +++ b/collects/embedded-gui/private/tests/only-one-child.ss @@ -7,7 +7,7 @@ (prefix a: "../alignment.ss") "../alignment-helpers.ss" "../dllist.ss" - (lib "click-forwarding-editor.ss" "mrlib") + mrlib/click-forwarding-editor "../on-show-pasteboard.ss" "../really-resized-pasteboard.ss" "../interface.ss" diff --git a/collects/embedded-gui/private/tests/stretching-in-alignment.ss b/collects/embedded-gui/private/tests/stretching-in-alignment.ss index 8d41e0a3..b8ab0e43 100644 --- a/collects/embedded-gui/private/tests/stretching-in-alignment.ss +++ b/collects/embedded-gui/private/tests/stretching-in-alignment.ss @@ -4,15 +4,15 @@ mred mzlib/etc mzlib/class - (lib "interface.ss" "mrlib" "private" "aligned-pasteboard") - (lib "debug.ss" "mike-lib") + mrlib/private/aligned-pasteboard/interface + mike-lib/debug mzlib/list mzlib/match (prefix a: "alignment.ss") - (lib "click-forwarding-editor.ss" "mrlib") - (lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard") - (lib "aligned-pasteboard.ss" "embedded-gui") - (lib "stretchable-editor-snip.ss" "embedded-gui")) + mrlib/click-forwarding-editor + mrlib/private/aligned-pasteboard/snip-lib + embedded-gui/aligned-pasteboard + embedded-gui/stretchable-editor-snip) (define f (new frame% (label "f") (width 400) (height 400))) (define e (new text%)) diff --git a/collects/embedded-gui/private/tests/test-case-box.ss b/collects/embedded-gui/private/tests/test-case-box.ss index f4e0a24f..4b966bec 100644 --- a/collects/embedded-gui/private/tests/test-case-box.ss +++ b/collects/embedded-gui/private/tests/test-case-box.ss @@ -3,7 +3,7 @@ mzlib/list mred mzlib/unitsig - (lib "tool.ss" "drscheme") + drscheme/tool mzlib/etc mzlib/match framework diff --git a/collects/embedded-gui/private/tests/test-show-feature.ss b/collects/embedded-gui/private/tests/test-show-feature.ss index ab37df7d..44880cbc 100644 --- a/collects/embedded-gui/private/tests/test-show-feature.ss +++ b/collects/embedded-gui/private/tests/test-show-feature.ss @@ -14,7 +14,7 @@ "../snip-lib.ss" "../interface.ss" "../alignment-helpers.ss" - (lib "click-forwarding-editor.ss" "mrlib") + mrlib/click-forwarding-editor "../on-show-pasteboard.ss" "../really-resized-pasteboard.ss" "../interface.ss" @@ -23,7 +23,7 @@ "../verthoriz-alignment.ss" "../suppress-modify-editor.ss") -(require (lib "print-debug.ss" "mike-lib")) +(require mike-lib/print-debug) (define aligned-pasteboard% (class (click-forwarding-editor-mixin diff --git a/collects/embedded-gui/private/tests/unaligned-childless-redux.ss b/collects/embedded-gui/private/tests/unaligned-childless-redux.ss index 7db231f7..a1c6ab25 100644 --- a/collects/embedded-gui/private/tests/unaligned-childless-redux.ss +++ b/collects/embedded-gui/private/tests/unaligned-childless-redux.ss @@ -1,5 +1,5 @@ -(require (lib "aligned-pasteboard.ss" "embedded-gui") - (lib "debug.ss" "mike-lib")) +(require embedded-gui/aligned-pasteboard + mike-lib/debug) (define f (new frame% (label "f") (width 100) (height 100))) (define e (new text%)) diff --git a/collects/framework/framework-unit.ss b/collects/framework/framework-unit.ss index a8dc6734..d9433fef 100644 --- a/collects/framework/framework-unit.ss +++ b/collects/framework/framework-unit.ss @@ -1,7 +1,7 @@ #lang scheme/base (require mzlib/unit - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (require "private/sig.ss" "private/number-snip.ss" @@ -94,4 +94,4 @@ (prefix handler: framework:handler^) (prefix scheme: framework:scheme^) (prefix main: framework:main^)) - framework-separate@ mred^)) \ No newline at end of file + framework-separate@ mred^)) diff --git a/collects/framework/gui-utils.ss b/collects/framework/gui-utils.ss index f3e6281f..b11bd38e 100644 --- a/collects/framework/gui-utils.ss +++ b/collects/framework/gui-utils.ss @@ -557,4 +557,4 @@ a delta suitable for use on a black background. See also - @scheme[gui-utils:get-clicked-clickback-delta].})) \ No newline at end of file + @scheme[gui-utils:get-clicked-clickback-delta].})) diff --git a/collects/framework/main.ss b/collects/framework/main.ss index 91615efd..3c01d1a4 100644 --- a/collects/framework/main.ss +++ b/collects/framework/main.ss @@ -1,8 +1,8 @@ #reader scribble/reader #lang scheme/gui -(require (lib "mred-unit.ss" "mred") - (lib "mred-sig.ss" "mred") +(require mred/mred-unit + mred/mred-sig framework/framework-unit framework/private/sig (for-syntax scheme/base) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index 4e95bf90..ab34d0a9 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -6,7 +6,7 @@ "sig.ss" "../gui-utils.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list string-constants) diff --git a/collects/framework/private/bday.ss b/collects/framework/private/bday.ss index cf0989c2..daa805c2 100644 --- a/collects/framework/private/bday.ss +++ b/collects/framework/private/bday.ss @@ -1,4 +1,4 @@ -(module bday mzscheme (require (lib "encode-decode.ss" "framework" "private")) +(module bday mzscheme (require framework/private/encode-decode) (decode \5d8f4 \10ec22010 diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index 5f34dc7e..9025edc0 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -2,7 +2,7 @@ (require mzlib/class "sig.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (import mred^ [prefix frame: framework:frame^] diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss index 26db84e0..9a45c779 100644 --- a/collects/framework/private/color-model.ss +++ b/collects/framework/private/color-model.ss @@ -1,7 +1,7 @@ #lang scheme/unit (require mzlib/class "sig.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list) (import) diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss index 3691426f..cec5b4b3 100644 --- a/collects/framework/private/comment-box.ss +++ b/collects/framework/private/comment-box.ss @@ -6,7 +6,7 @@ mred "sig.ss" "../decorated-editor-snip.ss" - (lib "include-bitmap.ss" "mrlib") + mrlib/include-bitmap string-constants) (import [prefix text: framework:text^] @@ -25,7 +25,7 @@ (send snipclass set-classname (format "~s" '(lib "comment-snip.ss" "framework"))) (send (get-the-snip-class-list) add snipclass) - (define bm (include-bitmap (lib "semicolon.gif" "icons"))) + (define bm (include-bitmap (lib "icons/semicolon.gif"))) (define (editor-keymap-mixin %) (class % diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index 4b7eb415..56884f15 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -6,7 +6,7 @@ "../preferences.ss" "../gui-utils.ss" mzlib/etc - (lib "mred-sig.ss" "mred") + mred/mred-sig scheme/path) (import mred^ diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss index 6edb99c6..1ff3f08f 100644 --- a/collects/framework/private/exit.ss +++ b/collects/framework/private/exit.ss @@ -4,7 +4,7 @@ "sig.ss" "../preferences.ss" "../gui-utils.ss" - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (import mred^) (export (rename framework:exit^ diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index 8a500f99..90704859 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -3,7 +3,7 @@ (require string-constants "sig.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/string scheme/path mzlib/etc) diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 03de4e51..ff87f446 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -6,7 +6,7 @@ "../preferences.ss" "../gui-utils.ss" "bday.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list scheme/path mzlib/etc) diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss index a1e3f1d5..dee3c5e1 100644 --- a/collects/framework/private/gen-standard-menus.ss +++ b/collects/framework/private/gen-standard-menus.ss @@ -282,4 +282,4 @@ @definterface[frame:standard-menus<%> (frame:basic<%>)]{ -- -) \ No newline at end of file +) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 1e973de2..80e9e631 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -5,7 +5,7 @@ "sig.ss" "../preferences.ss" "../gui-utils.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list scheme/path) diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index fb7e02c2..04ddade5 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -2,15 +2,14 @@ (require mzlib/class mzlib/list - (lib "hierlist.ss" "hierlist") + mrlib/hierlist "sig.ss" "../preferences.ss" "../gui-utils.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig scheme/path string-constants) - (import mred^ [prefix finder: framework:finder^] [prefix group: framework:group^] diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index 198cd853..8f960fa7 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -2,28 +2,28 @@ (require (for-syntax scheme/base) scheme/promise mzlib/class - (lib "include-bitmap.ss" "mrlib") + mrlib/include-bitmap "bday.ss" "sig.ss" - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (import mred^) (export framework:icon^) - (define eof-bitmap (delay (include-bitmap (lib "eof.gif" "icons")))) + (define eof-bitmap (delay (include-bitmap (lib "icons/eof.gif")))) (define (get-eof-bitmap) (force eof-bitmap)) - (define anchor-bitmap (delay (include-bitmap (lib "anchor.gif" "icons")))) + (define anchor-bitmap (delay (include-bitmap (lib "icons/anchor.gif")))) (define (get-anchor-bitmap) (force anchor-bitmap)) - (define lock-bitmap (delay (include-bitmap (lib "lock.gif" "icons")))) + (define lock-bitmap (delay (include-bitmap (lib "icons/lock.gif")))) (define (get-lock-bitmap) (force lock-bitmap)) - (define unlock-bitmap (delay (include-bitmap (lib "unlock.gif" "icons")))) + (define unlock-bitmap (delay (include-bitmap (lib "icons/unlock.gif")))) (define (get-unlock-bitmap) (force unlock-bitmap)) - (define autowrap-bitmap (delay (include-bitmap (lib "return.xbm" "icons")))) + (define autowrap-bitmap (delay (include-bitmap (lib "icons/return.xbm")))) (define (get-autowrap-bitmap) (force autowrap-bitmap)) - (define paren-highlight-bitmap (delay (include-bitmap (lib "paren.xbm" "icons")))) + (define paren-highlight-bitmap (delay (include-bitmap (lib "icons/paren.xbm")))) (define (get-paren-highlight-bitmap) (force paren-highlight-bitmap)) (define-syntax (make-get-cursor stx) @@ -46,8 +46,8 @@ (define get-up/down-cursor (make-get-cursor "up-down-cursor.xbm" "up-down-mask.xbm" 'size-n/s)) (define get-left/right-cursor (make-get-cursor "left-right-cursor.xbm" "left-right-mask.xbm" 'size-e/w)) - (define mrf-on-bitmap (delay (include-bitmap (lib "mrf.png" "icons")))) - (define gc-on-bitmap (delay (include-bitmap (lib "recycle.png" "icons")))) + (define mrf-on-bitmap (delay (include-bitmap (lib "icons/mrf.png")))) + (define gc-on-bitmap (delay (include-bitmap (lib "icons/recycle.png")))) (define (make-off-bitmap onb) (let* ([bitmap (make-object bitmap% diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 1232075f..85b31fcb 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -4,7 +4,7 @@ (require string-constants mzlib/class mzlib/list - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/match "../preferences.ss" "tex-table.ss" @@ -30,7 +30,10 @@ [sexp (and (file-exists? path) (call-with-input-file path read))]) (match sexp - [`(module ,name (lib "keybinding-lang.ss" "framework") ,@(x ...)) + [`(module ,name ,(or `(lib "keybinding-lang.ss" "framework") + `(lib "framework/keybinding-lang.ss") + `framework/keybinding-lang) + ,@(x ...)) (let ([km (dynamic-require spec '#%keymap)]) (hash-set! user-keybindings-files spec km) (send global chain-to-keymap km #t))] diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 61b2d9e8..5ce75c21 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -2,7 +2,7 @@ (require mzlib/class "sig.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (import mred^ [prefix preferences: framework:preferences^] diff --git a/collects/framework/private/mapdesc.ss b/collects/framework/private/mapdesc.ss index 1ee4e3b9..00575cfe 100644 --- a/collects/framework/private/mapdesc.ss +++ b/collects/framework/private/mapdesc.ss @@ -13,4 +13,3 @@ " (" (symbol->string 'events) " events)"))])) - \ No newline at end of file diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 84e025bb..17417bed 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -2,7 +2,7 @@ (require mzlib/class "sig.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred")) + mred/mred-sig) (import mred^) (export framework:menu^) diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss index 4de4dfdf..683ad975 100644 --- a/collects/framework/private/number-snip.ss +++ b/collects/framework/private/number-snip.ss @@ -2,7 +2,7 @@ #lang scheme/unit (require "sig.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/class "../preferences.ss" string-constants) diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index 15511244..856f8059 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -2,7 +2,7 @@ #lang scheme/unit (require mzlib/class "sig.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list mzlib/etc) diff --git a/collects/framework/private/pasteboard.ss b/collects/framework/private/pasteboard.ss index dfa4e5d9..cfd8a0c4 100644 --- a/collects/framework/private/pasteboard.ss +++ b/collects/framework/private/pasteboard.ss @@ -1,14 +1,13 @@ #lang scheme/unit - (require "sig.ss" - (lib "mred-sig.ss" "mred")) - + (require "sig.ss" mred/mred-sig) + (import mred^ [prefix editor: framework:editor^]) (export (rename framework:pasteboard^ [-keymap% keymap%])) (init-depend mred^ framework:editor^) - - + + (define basic% (editor:basic-mixin pasteboard%)) (define standard-style-list% (editor:standard-style-list-mixin basic%)) (define -keymap% (editor:keymap-mixin standard-style-list%)) diff --git a/collects/framework/private/path-utils.ss b/collects/framework/private/path-utils.ss index 6cde004b..72810d5b 100644 --- a/collects/framework/private/path-utils.ss +++ b/collects/framework/private/path-utils.ss @@ -1,6 +1,5 @@ #lang scheme/unit - (require "sig.ss" - (lib "mred-sig.ss" "mred")) + (require "sig.ss" mred/mred-sig) (import) (export framework:path-utils^) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index f265d603..6dff796a 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -34,7 +34,7 @@ the state transitions / contracts are: "sig.ss" "../gui-utils.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/list) (import mred^ diff --git a/collects/framework/private/standard-menus-items.ss b/collects/framework/private/standard-menus-items.ss index 6cee32ef..ced9aae2 100644 --- a/collects/framework/private/standard-menus-items.ss +++ b/collects/framework/private/standard-menus-items.ss @@ -396,4 +396,4 @@ '(string-constant about-menu-item) on-demand-do-nothing #f) - (make-after 'help-menu 'about 'nothing))) \ No newline at end of file + (make-after 'help-menu 'about 'nothing))) diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index e4e608ec..2e5df682 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -13,8 +13,8 @@ WARNING: printf is rebound in the body of the unit to always "sig.ss" "../gui-utils.ss" "../preferences.ss" - (lib "mred-sig.ss" "mred") - (lib "interactive-value-port.ss" "mrlib") + mred/mred-sig + mrlib/interactive-value-port mzlib/list mzlib/etc setup/dirs diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss index ba68f9b7..1ef687c8 100644 --- a/collects/framework/private/version.ss +++ b/collects/framework/private/version.ss @@ -1,7 +1,7 @@ #lang scheme/unit (require "sig.ss" - (lib "mred-sig.ss" "mred") + mred/mred-sig mzlib/string mzlib/list) (import) diff --git a/collects/hierlist/hierlist.ss b/collects/hierlist/hierlist.ss index db448c64..c0ae6e9c 100644 --- a/collects/hierlist/hierlist.ss +++ b/collects/hierlist/hierlist.ss @@ -1,4 +1,6 @@ #lang scheme/base +;; This is a stub for legacy code + (require mrlib/hierlist) (provide (all-from-out mrlib/hierlist)) diff --git a/collects/mrlib/hierlist.ss b/collects/mrlib/hierlist.ss index 475f38b6..d42fdcde 100644 --- a/collects/mrlib/hierlist.ss +++ b/collects/mrlib/hierlist.ss @@ -2,9 +2,9 @@ (require mzlib/unit scheme/gui/base - hierlist/hierlist-sig - hierlist/hierlist-unit) - + "hierlist/hierlist-sig.ss" + "hierlist/hierlist-unit.ss") + (define-values/invoke-unit/infer hierlist@) (provide-signature-elements hierlist^) diff --git a/collects/hierlist/hierlist-sig.ss b/collects/mrlib/hierlist/hierlist-sig.ss similarity index 100% rename from collects/hierlist/hierlist-sig.ss rename to collects/mrlib/hierlist/hierlist-sig.ss diff --git a/collects/hierlist/hierlist-unit.ss b/collects/mrlib/hierlist/hierlist-unit.ss similarity index 98% rename from collects/hierlist/hierlist-unit.ss rename to collects/mrlib/hierlist/hierlist-unit.ss index c045b9c1..ebf77bb4 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/mrlib/hierlist/hierlist-unit.ss @@ -3,25 +3,25 @@ (require (all-except mzlib/unit rename) mzlib/class mzlib/class100 - (lib "mred-sig.ss" "mred") - (lib "include-bitmap.ss" "mrlib") + mred/mred-sig + mrlib/include-bitmap "hierlist-sig.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)) - (define turn-up-click (include-bitmap "../icons/turn-up-click.png" 'png)) - (define turn-down-click (include-bitmap "../icons/turn-down-click.png" 'png)) + (define turn-up (include-bitmap "../../icons/turn-up.png" 'png)) + (define turn-down (include-bitmap "../../icons/turn-down.png" 'png)) + (define turn-up-click (include-bitmap "../../icons/turn-up-click.png" 'png)) + (define turn-down-click (include-bitmap "../../icons/turn-down-click.png" 'png)) (provide hierlist@) (define-unit hierlist@ (import mred^) (export hierlist^) (init-depend mred^) - - (define-local-member-name + + (define-local-member-name ;; In hierarchical-list% ensure-not-selected) @@ -32,7 +32,7 @@ (define blue (make-object brush% "BLUE" 'solid)) (define black-xor (make-object brush% "BLACK" 'hilite)) (define arrow-cursor (make-object cursor% 'arrow)) - + (define-values (up-bitmap down-bitmap up-click-bitmap down-click-bitmap) (values turn-up turn-down turn-up-click turn-down-click)) diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss index c4f23ac9..6864a061 100644 --- a/collects/mrlib/include-bitmap.ss +++ b/collects/mrlib/include-bitmap.ss @@ -2,10 +2,10 @@ (require mred mzlib/class mzlib/file - (lib "main-collects.ss" "setup")) + setup/main-collects) (require-for-syntax syntax/path-spec mzlib/cm-accomplice - (lib "main-collects.ss" "setup")) + setup/main-collects) (provide include-bitmap include-bitmap/relative-to) diff --git a/collects/mrlib/matrix-snip.ss b/collects/mrlib/matrix-snip.ss index d4276214..54f7af1a 100644 --- a/collects/mrlib/matrix-snip.ss +++ b/collects/mrlib/matrix-snip.ss @@ -2,7 +2,7 @@ (require mzlib/class mzlib/string - (lib "cache-image-snip.ss" "mrlib")) + mrlib/cache-image-snip) (provide visible-matrix% matrix-snip-class% diff --git a/collects/mrlib/path-dialog.ss b/collects/mrlib/path-dialog.ss index 9cc3c458..c21b433f 100644 --- a/collects/mrlib/path-dialog.ss +++ b/collects/mrlib/path-dialog.ss @@ -1,3 +1,3 @@ (module path-dialog mzscheme - (require (lib "path-dialog.ss" "mred" "private")) + (require mred/private/path-dialog) (provide path-dialog%)) diff --git a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss index 92d2628a..4f3fb595 100644 --- a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss @@ -1,7 +1,7 @@ (module aligned-pasteboard mzscheme (require - (lib "click-forwarding-editor.ss" "mrlib") + mrlib/click-forwarding-editor "geometry-managed-pasteboard.ss" "locked-pasteboard.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss b/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss index 69e740f4..b4a5a80c 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss @@ -1,4 +1,4 @@ -(require (lib "aligned-pasteboard.ss" "mrlib")) +(require mrlib/aligned-pasteboard) (with-handlers ([exn? (lambda (x) #f)]) (send (new pasteboard%) insert (new aligned-editor-snip% (editor (new horizontal-pasteboard%)))) #t) diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss index 16a8510e..3ee53399 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss @@ -1,6 +1,6 @@ (require "../locked-pasteboard.ss" - (lib "click-forwarding-editor.ss" "mrlib")) + mrlib/click-forwarding-editor) (define f (new frame% (width 400) (height 500) (label "test"))) (define e (new (click-forwarding-editor-mixin (locked-pasteboard-mixin pasteboard%)))) diff --git a/collects/mrlib/syntax-browser.ss b/collects/mrlib/syntax-browser.ss index 22b69cf1..dc01c9e0 100644 --- a/collects/mrlib/syntax-browser.ss +++ b/collects/mrlib/syntax-browser.ss @@ -498,10 +498,10 @@ needed to really make this work: (define (set-box/f! b v) (when (box? b) (set-box! b v))) - (define down-bitmap (include-bitmap (lib "turn-down.png" "icons") 'png)) - (define up-bitmap (include-bitmap (lib "turn-up.png" "icons") 'png)) - (define down-click-bitmap (include-bitmap (lib "turn-down-click.png" "icons") 'png)) - (define up-click-bitmap (include-bitmap (lib "turn-up-click.png" "icons") 'png)) + (define down-bitmap (include-bitmap (lib "icons/turn-down.png") 'png)) + (define up-bitmap (include-bitmap (lib "icons/turn-up.png") 'png)) + (define down-click-bitmap (include-bitmap (lib "icons/turn-down-click.png") 'png)) + (define up-click-bitmap (include-bitmap (lib "icons/turn-up-click.png") 'png)) (define arrow-snip-height (max 10 (send up-bitmap get-height) diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss index 3f9f0517..4b37088d 100644 --- a/collects/tests/framework/load.ss +++ b/collects/tests/framework/load.ss @@ -46,5 +46,5 @@ (let-values ([(_1 eles _2 _3) (signature-members #'sig #'whatever)]) (with-syntax ([eles eles]) #''eles))]))) - (eval '(require (lib "framework-sig.ss" "framework"))) + (eval '(require framework/framework-sig)) (eval '(for-each eval (signature->symbols framework^)))))) diff --git a/collects/tests/mzscheme/cache-image-snip-test.ss b/collects/tests/mzscheme/cache-image-snip-test.ss index a4465bd1..3e74efb0 100644 --- a/collects/tests/mzscheme/cache-image-snip-test.ss +++ b/collects/tests/mzscheme/cache-image-snip-test.ss @@ -1,6 +1,6 @@ (load-relative "loadtest.ss") -(require (lib "cache-image-snip.ss" "mrlib") +(require mrlib/cache-image-snip mzlib/unit) (invoke-unit