...

original commit: 382fab8691402cba8e3182ed2ae23ddbac4dfe8d

collects/framework/private/application.ss

@@ -1,6 +1,9 @@
 (module application mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss")
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide application@)
 
   (define application@
     (unit/sig framework:application^

collects/framework/private/autosave.ss

@@ -1,11 +1,14 @@
 (module autosave mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
-	   (lib "mred.ss" "mred"))
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide autosave@)
 
   (define autosave@
     (unit/sig framework:autosave^
-      (import [exit : framework:exit^]
+      (import [mred : mred^]
+	      [exit : framework:exit^]
 	      [preferences : framework:preferences^])
       
       (define objects null)

collects/framework/private/canvas.ss

@@ -1,11 +1,14 @@
 (module canvas mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
-	   (lib "mred.ss" "mred"))
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide canvas@)
 
   (define canvas@
     (unit/sig framework:canvas^
-      (import [preferences : framework:preferences^]
+      (import [mred : mred^]
+	      [preferences : framework:preferences^]
 	      [frame : framework:frame^])
       
       (define basic<%> (interface ((class->interface editor-canvas%))))

collects/framework/private/color-model.ss

@@ -1,8 +1,11 @@
 (module canvas mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
 	   (lib "function.ss"))
 
+  (provide color-model@)
+
   (define color-model@
     (unit/sig framework:color-model^
       (import)

collects/framework/private/editor.ss

@@ -1,12 +1,15 @@
 (module editor mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
-	   (lib "file.ss")
+	   (lib "mred-sig.ss" "mred")
-	   (lib "mred.ss" "mred"))
+	   (lib "file.ss"))
+
+  (provide editor@)
 
   (define editor@
     (unit/sig framework:editor^
-      (import [autosave : framework:autosave^]
+      (import [mred : mred^]
+	      [autosave : framework:autosave^]
 	      [finder : framework:finder^]
 	      [path-utils : framework:path-utils^]
 	      [keymap : framework:keymap^]

collects/framework/private/exit.ss

@@ -1,12 +1,15 @@
 (module exit mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
-	   (lib "file.ss")
+	   (lib "mred-sig.ss" "mred")
-	   (lib "mred.ss" "mred"))
+	   (lib "file.ss"))
+
+  (provide exit@)
 
   (define exit@
     (unit/sig framework:exit^
-      (import [preferences : framework:preferences^]
+      (import [mred : mred^]
+	      [preferences : framework:preferences^]
 	      [gui-utils : framework:gui-utils^])
       (rename (-exit exit))
       

collects/framework/private/finder.ss

@@ -1,10 +1,13 @@
 (module finder mzscheme
   (require (lib "unitsig.ss")
-	   "../sig.ss"
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
 	   (lib "string.ss")
 	   (lib "function.ss")
 	   (lib "file.ss"))
 
+  (provide finder@)
+
   (define finder@
     (unit/sig framework:finder^
       (import [preferences : framework:preferences^]

collects/framework/private/frame.ss

@@ -1,6 +1,14 @@
 (module frame mzscheme
-  (require (lib 
+  (require (lib "unitsig.ss")
-(unit/sig framework:frame^
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
+	   (lib "function.ss")
+	   (lib "file.ss"))
+
+  (provide frame@)
+
+  (define frame@
+    (unit/sig framework:frame^
   (import mred^
 	  [group : framework:group^]
 	  [preferences : framework:preferences^]
@@ -16,9 +24,7 @@
 	  [pasteboard : framework:pasteboard^]
 	  [editor : framework:editor^]
 	  [canvas : framework:canvas^]
-          [menu : framework:menu^]
+          [menu : framework:menu^])
-	  [mzlib:function : mzlib:function^]
-	  [mzlib:file : mzlib:file^])
 
   (rename [-editor<%> editor<%>]
 	  [-pasteboard% pasteboard%]
@@ -1516,6 +1522,4 @@
   (define searchable% (searchable-text-mixin (searchable-mixin text-info-file%)))
 
   (define -pasteboard% (pasteboard-mixin editor%))
-  (define pasteboard-info-file% (file-mixin -pasteboard%))
+  (define pasteboard-info-file% (file-mixin -pasteboard%)))))
-  
-  )

collects/framework/private/group.ss

@@ -1,10 +1,18 @@
-(unit/sig framework:group^
+(module group mzscheme
+  (require (lib "unitsig.ss")
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
+	   (lib "list.ss")
+	   (lib "file.ss"))
+
+  (povide group@)
+
+  (define group@
+    (unit/sig framework:group^
       (import mred^
 	      [application : framework:application^]
 	      [frame : framework:frame^]
-	  [preferences : framework:preferences^]
+	      [preferences : framework:preferences^])
-	  [mzlib:function : mzlib:function^]
-	  [mzlib:file : mzlib:file^])
 
       (define-struct frame (frame id))
       
@@ -228,4 +236,4 @@
 	(lambda ()
 	  (set! the-frame-group (make-object %))
 	  (set! get-the-frame-group (lambda () the-frame-group))
-      (get-the-frame-group))))
+	  (get-the-frame-group))))))

collects/framework/private/handler.ss

@@ -1,12 +1,20 @@
-(unit/sig framework:handler^
+(module handle mzscheme
+  (require (lib "unitsig.ss")
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
+	   (lib "file.ss"))
+
+  (provide handler@)
+
+  (define handler@
+    (unit/sig framework:handler^
       (import mred^
 	      [gui-utils : framework:gui-utils^]
 	      [finder : framework:finder^]
 	      [group : framework:group^]
 	      [text : framework:text^]
 	      [preferences : framework:preferences^]
-	  [frame : framework:frame^]
+	      [frame : framework:frame^])
-	  [mzlib:file : mzlib:file^])
       
       (define-struct handler (name extension handler))
 
@@ -139,4 +147,4 @@
 	      (send *open-directory*
 		    set-from-file! file))
 	    (and file
-	     (edit-file file))))))
+		 (edit-file file))))))))

collects/framework/private/icon.ss

@@ -1,4 +1,13 @@
-(unit/sig framework:icon^
+(module icon mzscheme
+  (require (lib "unitsig.ss")
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred")
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide icon@)
+  
+  (define icon@
+    (unit/sig framework:icon^
       (import mred^)
 
       (define icon-path 
@@ -72,4 +81,4 @@
 		    (send bdc set-bitmap bitmap)
 		    (send bdc clear)
 		    (send bdc set-bitmap #f)
-		bitmap)))))))
+		    bitmap)))))))))

collects/framework/private/keymap.ss

@@ -1,12 +1,19 @@
-(unit/sig framework:keymap^
+(module keymap mzscheme
+  (require (lib "unitsig.ss")
+	   (lib "list.ss")
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide keymap@)
+
+  (define keymap@ 
+    (unit/sig framework:keymap^
       (import mred^
 	      [keys : framework:keys^]
 	      [preferences : framework:preferences^]
 	      [finder : framework:finder^]
 	      [handler : framework:handler^]
 	      [scheme-paren : framework:scheme-paren^]
-	  [frame : framework:frame^]
+	      [frame : framework:frame^])
-	  [mzlib:function : mzlib:function^])
       
       (rename [-get-file get-file])
       
@@ -1133,4 +1140,4 @@
 			  (lambda (keymap)
 			    (send keymap chain-to-keymap global #t)
 			    (ctki keymap))])
-	(thunk)))))
+	    (thunk)))))))

collects/framework/private/main.ss

@@ -1,4 +1,12 @@
-(unit/sig framework:main^
+(module main mzscheme
+  (require (lib "unitsig.ss")
+	   "sig.ss"
+	   (lib "mred-sig.ss" "mred"))
+  
+  (provide main@)
+
+  (define main@
+    (unit/sig framework:main^
       (import mred^
 	      [preferences : framework:preferences^]
 	      [exit : framework:exit^]
@@ -162,4 +170,4 @@
       (preferences:set 'framework:file-dialogs 'std)
       (preferences:set 'framework:exit-when-no-frames #t)
       
-  (void))
+      (void))))

collects/framework/private/menu.ss

@@ -1,3 +1,11 @@
+(module menu mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide menu@)
+
+  (define menu@
 (unit/sig framework:menu^
   (import mred^
           [preferences : framework:preferences^])
@@ -23,4 +31,4 @@
           (set-shortcut #f)))))
   
   (define can-restore-menu-item% (can-restore-mixin menu-item%))
-  (define can-restore-checkable-menu-item% (can-restore-mixin checkable-menu-item%)))
+  (define can-restore-checkable-menu-item% (can-restore-mixin checkable-menu-item%)))))

collects/framework/private/panel.ss

@@ -1,3 +1,11 @@
+(module panel mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide panel@)
+
+  (define panel@
 (unit/sig framework:panel^
   (import mred^
 	  [mzlib:function : mzlib:function^])
@@ -466,4 +474,4 @@
         (set! thumb-canvas (make-object thumb-canvas% this)))))
 
   (define vertical-resizable% (vertical-resizable-mixin panel%))
-  (define vertical-resizable-pane% (vertical-resizable-mixin pane%)))
+  (define vertical-resizable-pane% (vertical-resizable-mixin pane%)))))

collects/framework/private/pasteboard.ss

@@ -1,4 +1,12 @@
-(unit/sig framework:pasteboard^
+(module pasteboard mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide pasteboard@)
+
+  (define pasteboard@
+    (unit/sig framework:pasteboard^
       (import mred^
 	      [editor : framework:editor^])
 
@@ -8,4 +16,4 @@
       (define -keymap% (editor:keymap-mixin basic%))
       (define file% (editor:file-mixin -keymap%))
       (define backup-autosave% (editor:backup-autosave-mixin file%))
-  (define info% (editor:info-mixin backup-autosave%)))
+      (define info% (editor:info-mixin backup-autosave%)))))

collects/framework/private/path-util.ss

@@ -1,5 +1,12 @@
+(module path-utils mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
 
-(unit/sig framework:path-utils^
+  (provide path-utils@)
+
+  (define path-utils@
+    (unit/sig framework:path-utils^
       (import)
       
       (define generate-autosave-name 
@@ -49,5 +56,5 @@
 		     '(#\. #\b #\a #\k)
 		     (cons (car list)
 			   (loop (cdr list))))))
-	  (string-append name "~")))))
+	      (string-append name "~")))))))
 

collects/framework/private/preferences.ss

@@ -1,4 +1,11 @@
-(unit/sig framework:preferences^
+(module preferences mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide preferences@)
+  (define preferences@
+    (unit/sig framework:preferences^
   (import mred^
 	  [prefs-file : framework:prefs-file^]
 	  [exn : framework:exn^]
@@ -642,4 +649,4 @@
 	  (send popup-menu set-selection 0))
 	(send popup-menu focus)
 	(send frame show #t)
-	frame))))
+	frame))))))

collects/framework/private/scheme.ss

@@ -3,6 +3,14 @@
 
 ; Scheme mode for MrEd.
 
+(module scheme mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide scheme@)
+
+  (define scheme@
 (unit/sig framework:scheme^
   (import mred^
 	  [preferences : framework:preferences^]
@@ -1021,6 +1029,4 @@
 		     (reset lambda-list-box lambda-keywords)
 		     #t))])
 	   (preferences:add-callback 'framework:tabify (lambda (p v) (update-list-boxes v)))
-	   main-panel)))))
+	   main-panel))))))))
-
-  )

collects/framework/private/text.ss

@@ -1,3 +1,11 @@
+(module text mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide text@)
+
+  (define text@
 (unit/sig framework:text^
   (import mred^
 	  [icon : framework:icon^]
@@ -470,4 +478,4 @@
   (define clever-file-format% (clever-file-format-mixin file%))
   (define backup-autosave% (editor:backup-autosave-mixin clever-file-format%))
   (define searching% (searching-mixin backup-autosave%))
-  (define info% (info-mixin (editor:info-mixin searching%))))
+  (define info% (info-mixin (editor:info-mixin searching%))))))

collects/framework/private/version.ss

@@ -1,4 +1,12 @@
-(unit/sig framework:version^
+(module version mzscheme
+  (require (lib "unitsig.ss")
+	   "sig"
+	   (lib "mred-sig.ss" "mred"))
+
+  (provide version@)
+
+  (define version@
+    (unit/sig framework:version^
       (import [mzlib:string : mzlib:string^]
 	      [mzlib:function : mzlib:function^])
 
@@ -19,6 +27,4 @@
 	(lambda (sep num)
 	  (set! specs (cons (list (mzlib:string:expr->string sep)
 				  (mzlib:string:expr->string num))
-			specs))))
+			    specs)))))))
-  
-  '(add-version-spec ': 5))