From 8bc1d1c68c7ad7babf8f859076678a5968ec0171 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 13 Nov 2007 12:40:00 +0000 Subject: [PATCH] v3.99.0.2 svn: r7706 original commit: 39cedb62edf9258b051a22a29a90be9c6841956f --- collects/embedded-gui/info.ss | 2 +- collects/framework/private/application.ss | 5 +- collects/framework/private/autosave.ss | 5 +- collects/framework/private/canvas.ss | 4 +- collects/framework/private/color-model.ss | 3 +- collects/framework/private/color-prefs.ss | 4 +- collects/framework/private/color.ss | 4 +- collects/framework/private/comment-box.ss | 5 +- collects/framework/private/editor.ss | 4 +- collects/framework/private/exit.ss | 5 +- collects/framework/private/finder.ss | 4 +- collects/framework/private/frame.ss | 4 +- collects/framework/private/group.ss | 4 +- collects/framework/private/handler.ss | 24 +- collects/framework/private/icon.ss | 4 +- collects/framework/private/keymap.ss | 5 +- collects/framework/private/main.ss | 5 +- collects/framework/private/menu.ss | 4 +- collects/framework/private/mode.ss | 4 +- collects/framework/private/number-snip.ss | 5 +- collects/framework/private/panel.ss | 8 +- collects/framework/private/pasteboard.ss | 4 +- collects/framework/private/path-utils.ss | 4 +- collects/framework/private/preferences.ss | 23 +- collects/framework/private/scheme.ss | 18 +- collects/framework/private/text.ss | 4 +- collects/framework/private/version.ss | 5 +- collects/hierlist/hierlist-sig.ss | 17 +- collects/hierlist/hierlist-unit.ss | 29 +- collects/mred/lang/reader.ss | 6 +- collects/mred/main.ss | 3 + collects/mred/mred-sig.ss | 407 +++++++++--------- collects/mred/mred.ss | 8 +- collects/mred/private/kernel.ss | 10 +- collects/mred/private/mritem.ss | 13 +- collects/mred/private/mrmenu.ss | 14 +- collects/mred/private/mrpanel.ss | 5 +- collects/mred/private/path-dialog.ss | 2 +- collects/mred/private/snipfile.ss | 4 +- collects/mzscheme/lang/reader.ss | 7 +- collects/scheme/gui.ss | 4 + collects/scheme/gui/init.ss | 8 + collects/scheme/gui/lang/reader.ss | 2 + collects/scribblings/gui/add-color-intf.scrbl | 2 +- .../scribblings/gui/area-container-intf.scrbl | 2 +- .../gui/area-container-window-intf.scrbl | 2 +- collects/scribblings/gui/area-intf.scrbl | 2 +- collects/scribblings/gui/blurbs.ss | 18 +- collects/scribblings/gui/button-class.scrbl | 2 +- collects/scribblings/gui/canvas-class.scrbl | 2 +- collects/scribblings/gui/canvas-intf.scrbl | 2 +- .../scribblings/gui/check-box-class.scrbl | 2 +- .../gui/checkable-menu-item-class.scrbl | 2 +- collects/scribblings/gui/choice-class.scrbl | 2 +- .../gui/clipboard-client-class.scrbl | 2 +- collects/scribblings/gui/clipboard-intf.scrbl | 2 +- .../scribblings/gui/combo-field-class.scrbl | 2 +- collects/scribblings/gui/common.ss | 36 +- .../scribblings/gui/control-event-class.scrbl | 2 +- collects/scribblings/gui/control-intf.scrbl | 2 +- collects/scribblings/gui/cursor-class.scrbl | 2 +- collects/scribblings/gui/diagrams.ss | 11 +- collects/scribblings/gui/dialog-class.scrbl | 2 +- collects/scribblings/gui/dialog-funcs.scrbl | 4 +- .../scribblings/gui/editor-admin-class.scrbl | 2 +- .../scribblings/gui/editor-canvas-class.scrbl | 2 +- collects/scribblings/gui/editor-classes.scrbl | 2 +- .../gui/editor-data-class-class.scrbl | 2 +- .../gui/editor-data-class-list-intf.scrbl | 2 +- .../scribblings/gui/editor-data-class.scrbl | 2 +- collects/scribblings/gui/editor-funcs.scrbl | 4 +- collects/scribblings/gui/editor-intf.scrbl | 2 +- .../scribblings/gui/editor-overview.scrbl | 4 +- .../scribblings/gui/editor-snip-class.scrbl | 2 +- .../gui/editor-snip-editor-admin-intf.scrbl | 2 +- .../gui/editor-stream-in-base-class.scrbl | 2 +- .../editor-stream-in-bytes-base-class.scrbl | 2 +- .../gui/editor-stream-in-class.scrbl | 2 +- .../gui/editor-stream-out-base-class.scrbl | 2 +- .../editor-stream-out-bytes-base-class.scrbl | 2 +- .../gui/editor-stream-out-class.scrbl | 2 +- .../gui/editor-wordbreak-map-class.scrbl | 2 +- collects/scribblings/gui/event-class.scrbl | 2 +- .../scribblings/gui/eventspace-funcs.scrbl | 4 +- collects/scribblings/gui/font-funcs.scrbl | 2 +- collects/scribblings/gui/frame-class.scrbl | 2 +- collects/scribblings/gui/gauge-class.scrbl | 2 +- .../scribblings/gui/global-draw-funcs.scrbl | 2 +- .../gui/group-box-panel-class.scrbl | 2 +- .../gui/grow-box-spacer-pane-class.scrbl | 2 +- collects/scribblings/gui/gui.scrbl | 10 +- collects/scribblings/gui/guide.scrbl | 2 +- .../gui/horizontal-pane-class.scrbl | 2 +- .../gui/horizontal-panel-class.scrbl | 2 +- .../scribblings/gui/image-snip-class.scrbl | 2 +- collects/scribblings/gui/info.ss | 2 +- .../scribblings/gui/key-event-class.scrbl | 2 +- collects/scribblings/gui/keymap-class.scrbl | 2 +- .../gui/labelled-menu-item-intf.scrbl | 2 +- collects/scribblings/gui/list-box-class.scrbl | 2 +- .../scribblings/gui/list-control-intf.scrbl | 2 +- collects/scribblings/gui/menu-bar-class.scrbl | 2 +- collects/scribblings/gui/menu-class.scrbl | 2 +- .../scribblings/gui/menu-item-class.scrbl | 2 +- .../gui/menu-item-container-intf.scrbl | 2 +- collects/scribblings/gui/menu-item-intf.scrbl | 2 +- collects/scribblings/gui/message-class.scrbl | 2 +- collects/scribblings/gui/miscwin-funcs.scrbl | 20 +- .../scribblings/gui/mouse-event-class.scrbl | 2 +- .../scribblings/gui/mult-color-intf.scrbl | 2 +- collects/scribblings/gui/pane-class.scrbl | 2 +- collects/scribblings/gui/panel-class.scrbl | 2 +- .../scribblings/gui/pasteboard-class.scrbl | 2 +- .../scribblings/gui/popup-menu-class.scrbl | 2 +- collects/scribblings/gui/prefs.scrbl | 2 +- .../scribblings/gui/printer-dc-class.scrbl | 2 +- .../scribblings/gui/radio-box-class.scrbl | 2 +- .../scribblings/gui/readable-snip-intf.scrbl | 4 +- collects/scribblings/gui/reference.scrbl | 2 +- .../scribblings/gui/scroll-event-class.scrbl | 2 +- .../gui/selectable-menu-item-intf.scrbl | 2 +- .../gui/separator-menu-item-class.scrbl | 2 +- collects/scribblings/gui/slider-class.scrbl | 2 +- .../scribblings/gui/snip-admin-class.scrbl | 2 +- .../scribblings/gui/snip-class-class.scrbl | 4 +- .../gui/snip-class-list-intf.scrbl | 2 +- collects/scribblings/gui/snip-class.scrbl | 2 +- .../scribblings/gui/string-snip-class.scrbl | 2 +- .../scribblings/gui/style-delta-class.scrbl | 2 +- collects/scribblings/gui/style-intf.scrbl | 2 +- .../scribblings/gui/style-list-class.scrbl | 2 +- collects/scribblings/gui/subarea-intf.scrbl | 2 +- collects/scribblings/gui/subwindow-intf.scrbl | 2 +- .../scribblings/gui/system-menu-funcs.scrbl | 4 +- .../scribblings/gui/tab-panel-class.scrbl | 2 +- collects/scribblings/gui/tab-snip-class.scrbl | 2 +- collects/scribblings/gui/text-class.scrbl | 2 +- .../scribblings/gui/text-field-class.scrbl | 2 +- collects/scribblings/gui/timer-class.scrbl | 2 +- .../gui/top-level-window-intf.scrbl | 2 +- .../scribblings/gui/vertical-pane-class.scrbl | 2 +- .../gui/vertical-panel-class.scrbl | 2 +- collects/scribblings/gui/win-classes.scrbl | 2 +- collects/scribblings/gui/win-funcs.scrbl | 2 +- collects/scribblings/gui/win-overview.scrbl | 4 +- collects/scribblings/gui/window-intf.scrbl | 2 +- 146 files changed, 523 insertions(+), 493 deletions(-) create mode 100644 collects/mred/main.ss create mode 100644 collects/scheme/gui.ss create mode 100644 collects/scheme/gui/init.ss create mode 100644 collects/scheme/gui/lang/reader.ss diff --git a/collects/embedded-gui/info.ss b/collects/embedded-gui/info.ss index 39cdc379..afadd172 100644 --- a/collects/embedded-gui/info.ss +++ b/collects/embedded-gui/info.ss @@ -1,4 +1,4 @@ -(module info (lib "infotab.ss" "setup") +(module info setup/infotab (define name "Embedded GUI") (define doc.txt "doc.txt")) diff --git a/collects/framework/private/application.ss b/collects/framework/private/application.ss index ccad3e7e..30eaa497 100644 --- a/collects/framework/private/application.ss +++ b/collects/framework/private/application.ss @@ -1,4 +1,5 @@ -(module application (lib "a-unit.ss") +#lang scheme/unit + (require "sig.ss") (import) @@ -11,4 +12,4 @@ (unless (string? x) (error 'current-app-name "the app name must be a string")) - x)))) \ No newline at end of file + x))) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index 98e2fed7..1de497d8 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -1,5 +1,6 @@ -(module autosave (lib "a-unit.ss") +#lang scheme/unit + (require (lib "class.ss") (lib "file.ss") "sig.ss" @@ -312,4 +313,4 @@ (delete-file autosave-name) (when tmp-name (delete-file tmp-name)) - orig-name)))))) + orig-name))))) diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index 8e200e0d..cd680ff0 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -1,4 +1,4 @@ -(module canvas (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") "sig.ss" "../preferences.ss" @@ -178,4 +178,4 @@ (define -color% (color-mixin basic%)) (define info% (info-mixin basic%)) (define delegate% (delegate-mixin basic%)) - (define wide-snip% (wide-snip-mixin basic%))) + (define wide-snip% (wide-snip-mixin basic%)) diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss index 18d5ba3e..df0d7d42 100644 --- a/collects/framework/private/color-model.ss +++ b/collects/framework/private/color-model.ss @@ -1,4 +1,4 @@ -(module color-model (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred") @@ -265,4 +265,3 @@ ;; (print-struct #t) ;; (xyz->luv (make-xyz 95.0 100.0 141.0)) ;; (xyz->luv (make-xyz 60.0 80.0 20.0)) - ) \ No newline at end of file diff --git a/collects/framework/private/color-prefs.ss b/collects/framework/private/color-prefs.ss index b95f34e5..f03ac6f5 100644 --- a/collects/framework/private/color-prefs.ss +++ b/collects/framework/private/color-prefs.ss @@ -1,4 +1,4 @@ -(module color-prefs (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") (lib "etc.ss") (lib "mred.ss" "mred") @@ -482,4 +482,4 @@ [(is-a? old style-delta%) (send old set-delta-foreground color) (preferences:set p old)]))) - color-scheme-colors))) + color-scheme-colors)) diff --git a/collects/framework/private/color.ss b/collects/framework/private/color.ss index 9c670e67..78d6889e 100644 --- a/collects/framework/private/color.ss +++ b/collects/framework/private/color.ss @@ -1,4 +1,4 @@ -(module color (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") (lib "thread.ss") (lib "mred.ss" "mred") @@ -724,4 +724,4 @@ (super-new))) - (define text-mode% (text-mode-mixin mode:surrogate-text%))) + (define text-mode% (text-mode-mixin mode:surrogate-text%)) diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss index d1ea8988..5cc3adc0 100644 --- a/collects/framework/private/comment-box.ss +++ b/collects/framework/private/comment-box.ss @@ -1,5 +1,6 @@ -(module comment-box (lib "a-unit.ss") +#lang scheme/unit + (require (lib "class.ss") (lib "etc.ss") (lib "mred.ss" "mred") @@ -121,4 +122,4 @@ (make-special-comment "comment")) (super-instantiate ()) (inherit set-snipclass) - (set-snipclass snipclass)))) \ No newline at end of file + (set-snipclass snipclass))) diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index d193816a..509e8afe 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -1,5 +1,5 @@ -(module editor (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") (lib "string-constant.ss" "string-constants") "sig.ss" @@ -598,4 +598,4 @@ (set! callback-running? #f)) #f)))) 'framework:update-lock-icon)) - (super-new)))) + (super-new))) diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss index 8eb04670..7b3df176 100644 --- a/collects/framework/private/exit.ss +++ b/collects/framework/private/exit.ss @@ -1,4 +1,5 @@ -(module exit (lib "a-unit.ss") +#lang scheme/unit + (require (lib "string-constant.ss" "string-constants") "sig.ss" "../preferences.ss" @@ -72,4 +73,4 @@ (exit) (set! is-exiting? #f)))] [else - (set! is-exiting? #f)]))) + (set! is-exiting? #f)])) diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index 6320772d..1ed3aedf 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -1,5 +1,5 @@ -(module finder (lib "a-unit.ss") +#lang scheme/unit (require (lib "string-constant.ss" "string-constants") "sig.ss" "../preferences.ss" @@ -100,4 +100,4 @@ (apply (case (preferences:get 'framework:file-dialogs) [(std) std-get-file] [(common) common-get-file]) - args)))) + args))) diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 401a70f7..d19023cf 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -1,4 +1,4 @@ -(module frame (lib "a-unit.ss") +#lang scheme/unit (require (lib "string-constant.ss" "string-constants") (lib "class.ss") (lib "include.ss") @@ -2526,4 +2526,4 @@ (define searchable% (searchable-text-mixin (searchable-mixin -text%))) (define delegate% (delegate-mixin searchable%)) - (define -pasteboard% (pasteboard-mixin open-here%))) + (define -pasteboard% (pasteboard-mixin open-here%)) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index de91b64b..bcf5ea70 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -1,5 +1,5 @@ -(module group (lib "a-unit.ss") +#lang scheme/unit (require (lib "string-constant.ss" "string-constants") (lib "class.ss") "sig.ss" @@ -341,4 +341,4 @@ (internal-get-the-frame-group))) (define (get-the-frame-group) - (internal-get-the-frame-group))) + (internal-get-the-frame-group)) diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index cfbebe20..f9d1cc1b 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -1,5 +1,5 @@ -(module handler (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") (lib "list.ss") (lib "hierlist.ss" "hierlist") @@ -200,14 +200,18 @@ ;; updates the recent menu preferences ;; with the positions `start' and `end' (define (set-recent-position filename start end) - (let ([recent-items - (filter (λ (x) (string=? (path->string (car x)) - (path->string filename))) - (preferences:get 'framework:recently-opened-files/pos))]) - (unless (null? recent-items) - (let ([recent-item (car recent-items)]) - (set-car! (cdr recent-item) start) - (set-car! (cddr recent-item) end))))) + (let* ([recent-items + (preferences:get 'framework:recently-opened-files/pos)] + [new-recent-items + (map (λ (x) + (if (string=? (path->string (car x)) + (path->string filename)) + (list* (car x) start end (cdddr x)) + x)) + (preferences:get 'framework:recently-opened-files/pos))]) + (unless (equal? recent-items new-recent-items) + (preferences:set 'framework:recently-opened-files/pos + new-recent-items)))) ;; install-recent-items : (is-a?/c menu%) -> void? (define (install-recent-items menu) @@ -389,4 +393,4 @@ (send *open-directory* set-from-file! file)) (and file - (edit-file file))))) + (edit-file file)))) diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index f6ed5a8c..e9fb159d 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -1,4 +1,4 @@ -(module icon (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") (lib "include-bitmap.ss" "mrlib") "bday.ss" @@ -69,4 +69,4 @@ (force (if (mrf-bday?) mrf-off-bitmap - gc-off-bitmap)))) + gc-off-bitmap))) diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index a2763aff..4d0a7ec7 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -1,5 +1,6 @@ -(module keymap (lib "a-unit.ss") +#lang scheme/unit + (require (lib "string-constant.ss" "string-constants") (lib "class.ss") (lib "list.ss") @@ -1404,4 +1405,4 @@ (λ (keymap) (send keymap chain-to-keymap global #t) (ctki keymap))]) - (thunk))))) + (thunk)))) diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 6852db51..066c7655 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -1,4 +1,4 @@ -(module main (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") "sig.ss" "../preferences.ss" @@ -298,6 +298,3 @@ ;(preferences:set 'framework:file-dialogs 'std) ;; setup the color scheme stuff - - - (void)) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 1fd62879..7e6d1ed0 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -1,4 +1,4 @@ -(module menu (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") "sig.ss" "../preferences.ss" @@ -45,4 +45,4 @@ (define can-restore-menu-item% (can-restore-mixin menu-item%)) (define can-restore-checkable-menu-item% (can-restore-mixin checkable-menu-item%)) - (define can-restore-underscore-menu% (can-restore-underscore-mixin menu%))) + (define can-restore-underscore-menu% (can-restore-underscore-mixin menu%)) diff --git a/collects/framework/private/mode.ss b/collects/framework/private/mode.ss index 007b24e1..389ec479 100644 --- a/collects/framework/private/mode.ss +++ b/collects/framework/private/mode.ss @@ -1,4 +1,4 @@ -(module mode (lib "a-unit.ss") +#lang scheme/unit (require (lib "surrogate.ss") (lib "class.ss") "sig.ss") @@ -47,4 +47,4 @@ (augment #t can-set-size-constraint? ()) (override can-do-edit-operation? (op) (op recursive?)) (augment #t can-load-file? (filename format)) - (augment #t can-save-file? (filename format))))) + (augment #t can-save-file? (filename format)))) diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss index 1e40e10d..9b8a8ead 100644 --- a/collects/framework/private/number-snip.ss +++ b/collects/framework/private/number-snip.ss @@ -1,5 +1,6 @@ -(module number-snip (lib "a-unit.ss") +#lang scheme/unit + (require "sig.ss" (lib "mred-sig.ss" "mred") (lib "class.ss") @@ -515,4 +516,4 @@ (define (hash-table-bound? ht key) (let/ec k (hash-table-get ht key (λ () (k #f))) - #t))) \ No newline at end of file + #t)) diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index 471779e8..8d8e4dbd 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -1,5 +1,5 @@ -(module panel (lib "a-unit.ss") +#lang scheme/unit (require (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred") @@ -267,10 +267,10 @@ [(and gap (send evt button-down? 'left)) (set! resizing-dim (event-get-dim evt)) (set! resizing-gap gap)] - [(and resizing-dim (send evt button-up?)) + [(send evt button-up? 'left) (set! resizing-dim #f) (set! resizing-gap #f)] - [(and resizing-dim (send evt moving?)) + [(and resizing-dim resizing-gap (send evt moving?)) (let-values ([(width height) (get-client-size)]) (let* ([before-percentage (gap-before-percentage resizing-gap)] [orig-before (percentage-% before-percentage)] @@ -419,5 +419,5 @@ (define vertical-dragable% (vertical-dragable-mixin (dragable-mixin vertical-panel%))) - (define horizontal-dragable% (horizontal-dragable-mixin (dragable-mixin horizontal-panel%)))) + (define horizontal-dragable% (horizontal-dragable-mixin (dragable-mixin horizontal-panel%))) diff --git a/collects/framework/private/pasteboard.ss b/collects/framework/private/pasteboard.ss index 74236a14..dfa4e5d9 100644 --- a/collects/framework/private/pasteboard.ss +++ b/collects/framework/private/pasteboard.ss @@ -1,4 +1,4 @@ -(module pasteboard (lib "a-unit.ss") +#lang scheme/unit (require "sig.ss" (lib "mred-sig.ss" "mred")) @@ -14,4 +14,4 @@ (define -keymap% (editor:keymap-mixin standard-style-list%)) (define file% (editor:file-mixin -keymap%)) (define backup-autosave% (editor:backup-autosave-mixin file%)) - (define info% (editor:info-mixin backup-autosave%))) + (define info% (editor:info-mixin backup-autosave%)) diff --git a/collects/framework/private/path-utils.ss b/collects/framework/private/path-utils.ss index 39cbe74f..6cde004b 100644 --- a/collects/framework/private/path-utils.ss +++ b/collects/framework/private/path-utils.ss @@ -1,4 +1,4 @@ -(module path-utils (lib "a-unit.ss") +#lang scheme/unit (require "sig.ss" (lib "mred-sig.ss" "mred")) @@ -54,5 +54,5 @@ [(eq? (system-type) 'windows) (build-path base (bytes->path-element (bytes-append name-bytes #".bak")))] [else - (build-path base (bytes->path-element (bytes-append name-bytes #"~")))])))))) + (build-path base (bytes->path-element (bytes-append name-bytes #"~")))]))))) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index c06af3a3..1a8a9595 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -26,7 +26,8 @@ the state transitions / contracts are: |# -(module preferences (lib "a-unit.ss") +#lang scheme/unit + (require (lib "string-constant.ss" "string-constants") (lib "class.ss") (lib "file.ss") @@ -132,7 +133,7 @@ the state transitions / contracts are: (add-to-existing-children titles make-panel - (λ (new-subtree) (set! ppanels (cons new-subtree ppanels)))))) + (λ (new-ppanels) (set! ppanels new-ppanels))))) ;; add-to-existing-children : (listof string) (panel -> panel) (ppanel -> void) ;; adds the child specified by the path in-titles to the tree. @@ -143,7 +144,7 @@ the state transitions / contracts are: [banger banger]) (cond [(null? children) - (banger (build-new-subtree (cons title titles) make-panel))] + (banger (list (build-new-subtree (cons title titles) make-panel)))] [else (let ([child (car children)]) (if (string=? (ppanel-name child) title) @@ -157,19 +158,17 @@ the state transitions / contracts are: (ppanel-interior-children child) (car titles) (cdr titles) - (λ (x) + (λ (children) (set-ppanel-interior-children! - (cons - x - (ppanel-interior-children child)))))]) + child + children)))]) (loop (cdr children) title titles - (λ (x) - (set-cdr! children - (cons x (cdr children)))))))]))) - + (λ (children) + (banger (cons child children))))))]))) + ;; build-new-subtree : (cons string (listof string)) (panel -> panel) -> ppanel (define (build-new-subtree titles make-panel) (let loop ([title (car titles)] @@ -641,4 +640,4 @@ the state transitions / contracts are: main)))) (set! local-add-font-panel void)) - (define (add-font-panel) (local-add-font-panel))) + (define (add-font-panel) (local-add-font-panel)) diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index c191ed67..c2a6457d 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -1,7 +1,7 @@ ;; originally by Dan Grossman ;; 6/30/95 -(module scheme (lib "a-unit.ss") +#lang scheme/unit (require "collapsed-snipclass-helpers.ss" (lib "string-constant.ss" "string-constants") (lib "class.ss") @@ -1757,23 +1757,27 @@ (send text change-style sd 0 (send text last-position)))) (define (update-pref sel x) (let ([pref (preferences:get 'framework:tabify)]) - (set-car! (sel pref) x) - (preferences:set 'framework:tabify pref))) + (let ([pref + (let loop ([pref pref][sel sel]) + (if (zero? sel) + (cons sel (cdr pref)) + (cons (car pref) (loop (cdr pref) (sub1 sel)))))]) + (preferences:set 'framework:tabify pref)))) (define-values (begin-list-box begin-regexp-text) (make-column "Begin" 'begin begin-keywords - (λ (x) (update-pref cdr x)))) + (λ (x) (update-pref 1 x)))) (define-values (define-list-box define-regexp-text) (make-column "Define" 'define define-keywords - (λ (x) (update-pref cddr x)))) + (λ (x) (update-pref 2 x)))) (define-values (lambda-list-box lambda-regexp-text) (make-column "Lambda" 'lambda lambda-keywords - (λ (x) (update-pref cdddr x)))) + (λ (x) (update-pref 3 x)))) (define (update-list-boxes hash-table) (let-values ([(begin-keywords define-keywords lambda-keywords) (get-keywords hash-table)] [(reset) (λ (list-box keywords) @@ -1792,6 +1796,4 @@ (preferences:add-callback 'framework:tabify (λ (p v) (update-gui v))) (update-gui (preferences:get 'framework:tabify)) main-panel) - - ) diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index 759d0476..23c9c445 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -5,7 +5,7 @@ WARNING: printf is rebound in the body of the unit to always |# -(module text (lib "a-unit.ss") +#lang scheme/unit (require (lib "string-constant.ss" "string-constants") (lib "class.ss") (lib "match.ss") @@ -2814,4 +2814,4 @@ designates the character that triggers autocompletion (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%))) diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss index 6211a8cc..5c156bc6 100644 --- a/collects/framework/private/version.ss +++ b/collects/framework/private/version.ss @@ -1,4 +1,5 @@ -(module version (lib "a-unit.ss") +#lang scheme/unit + (require "sig.ss" (lib "mred-sig.ss" "mred") (lib "string.ss") @@ -19,4 +20,4 @@ (define (add-spec sep num) (set! specs (cons (list (expr->string sep) (format "~a" num)) - specs)))) + specs))) diff --git a/collects/hierlist/hierlist-sig.ss b/collects/hierlist/hierlist-sig.ss index a5201778..1983d1b8 100644 --- a/collects/hierlist/hierlist-sig.ss +++ b/collects/hierlist/hierlist-sig.ss @@ -1,11 +1,10 @@ -(module hierlist-sig (lib "a-signature.ss") - hierarchical-list% - hierarchical-list-item<%> - hierarchical-list-item% - hierarchical-list-compound-item<%> - hierarchical-list-compound-item% - - hierarchical-item-snip% - hierarchical-list-snip%) +#lang scheme/signature +hierarchical-list% +hierarchical-list-item<%> +hierarchical-list-item% +hierarchical-list-compound-item<%> +hierarchical-list-compound-item% +hierarchical-item-snip% +hierarchical-list-snip% diff --git a/collects/hierlist/hierlist-unit.ss b/collects/hierlist/hierlist-unit.ss index ae5c8201..a0f53922 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/hierlist/hierlist-unit.ss @@ -338,30 +338,33 @@ [depth dpth] [parent-snip parent-snp] [children null] - [last-child #f] + [new-children null] [no-sublists? #f]) (private + [append-children! (lambda () + (unless (null? new-children) + (set! children (append children (reverse new-children))) + (set! new-children null)))] [make-whitespace (lambda () (make-object whitespace-snip%))] [insert-item (lambda (mixin snip% whitespace?) (let ([s (make-object snip% this top top-select (add1 depth) mixin)]) (begin-edit-sequence) - (unless (null? children) + (unless (and (null? children) + (null? new-children)) (insert #\newline (last-position))) (when whitespace? (insert (make-whitespace) (last-position))) (insert s (last-position)) (end-edit-sequence) - (let ([p (list s)]) - (if last-child - (set-cdr! last-child p) - (set! children (append children p))) - (set! last-child p)) + (set! new-children (cons s new-children)) (send s get-item)))]) (public [get-parent-snip (lambda () parent-snip)] [deselect-all - (lambda () (for-each (lambda (x) (send x deselect-all)) children))] + (lambda () + (append-children!) + (for-each (lambda (x) (send x deselect-all)) children))] [new-item (case-lambda [() (new-item (lambda (x) x))] @@ -376,12 +379,16 @@ (insert-item mixin hierarchical-list-snip% #f)])] [set-no-sublists (lambda (no?) + (append-children!) (unless (null? children) (error 'set-no-sublists "cannot change sublist mode because the list is non-empty")) (set! no-sublists? (and no? #t)))] - [get-items (lambda () (map (lambda (x) (send x get-item)) children))] + [get-items (lambda () + (append-children!) + (map (lambda (x) (send x get-item)) children))] [delete-item (lambda (i) + (append-children!) (let loop ([pos 0][l children][others null]) (cond [(null? l) (error 'hierarchical-list-compound-item::delete-item "item not found: ~a" i)] @@ -389,12 +396,12 @@ (send top ensure-not-selected i) (send (car l) deselect-all) (set! children (append (reverse others) (cdr l))) - (set! last-child #f) (let ([s (line-start-position pos)] [e (line-end-position pos)]) (delete (if (zero? s) s (sub1 s)) (if (zero? s) (add1 e) e)))] [else (loop (add1 pos) (cdr l) (cons (car l) others))])))] [sort (opt-lambda (less-than? [recur? #t]) + (append-children!) (let ([l (sort* children (lambda (a b) (less-than? (send a get-item) @@ -424,12 +431,12 @@ (unless (null? l) (delete)) ; delete last #\newline (set! children l) - (set! last-child #f) (when to-scroll-to (send (send to-scroll-to get-item) scroll-to))) (end-edit-sequence)))] [reflow-items (lambda () + (append-children!) (for-each (lambda (c) (send c reflow-item)) diff --git a/collects/mred/lang/reader.ss b/collects/mred/lang/reader.ss index b68e74b5..2a0d3431 100644 --- a/collects/mred/lang/reader.ss +++ b/collects/mred/lang/reader.ss @@ -1,4 +1,2 @@ -(module reader mzscheme - (require (lib "module-reader.ss" "syntax")) - - (provide-module-reader (lib "main.ss" "mred" "lang"))) +(module reader syntax/module-reader + mred) diff --git a/collects/mred/main.ss b/collects/mred/main.ss new file mode 100644 index 00000000..65ffc5cc --- /dev/null +++ b/collects/mred/main.ss @@ -0,0 +1,3 @@ +(module main scheme/base + (require "mred.ss") + (provide (all-from-out "mred.ss"))) diff --git a/collects/mred/mred-sig.ss b/collects/mred/mred-sig.ss index 2072cdcd..34a0752b 100644 --- a/collects/mred/mred-sig.ss +++ b/collects/mred/mred-sig.ss @@ -1,206 +1,205 @@ -(module mred-sig (lib "a-signature.ss") - add-color<%> - add-editor-keymap-functions - add-pasteboard-keymap-functions - add-text-keymap-functions - append-editor-font-menu-items - append-editor-operation-menu-items - application-about-handler - application-file-handler - application-preferences-handler - application-quit-handler - area-container-window<%> - area-container<%> - area<%> - begin-busy-cursor - bell - bitmap% - bitmap-dc% - brush% - brush-list% - button% - can-get-page-setup-from-user? - canvas% - canvas<%> - check-box% - check-for-break - checkable-menu-item% - choice% - clipboard-client% - clipboard<%> - color% - color-database<%> - combo-field% - control-event% - control<%> - current-eventspace - current-eventspace-has-menu-root? - current-eventspace-has-standard-menus? - current-ps-afm-file-paths - current-ps-cmap-file-paths - current-ps-setup - current-text-keymap-initializer - cursor% - dc<%> - dc-path% - dialog% - editor-admin% - editor-canvas% - editor-data% - editor-data-class% - editor-data-class-list<%> - editor-set-x-selection-mode - editor-snip% - editor-snip-editor-admin<%> - editor-stream-in% - editor-stream-in-base% - editor-stream-in-bytes-base% - editor-stream-out% - editor-stream-out-base% - editor-stream-out-bytes-base% - editor-wordbreak-map% - editor<%> - end-busy-cursor - event% - event-dispatch-handler - eventspace-handler-thread - eventspace-shutdown? - eventspace? - file-creator-and-type - find-graphical-system-path - flush-display - font% - font-list% - font-name-directory<%> - frame% - gauge% - get-choices-from-user - get-color-from-user - get-default-shortcut-prefix - get-directory - get-display-depth - get-display-left-top-inset - get-display-size - get-face-list - get-family-builtin-face - get-file - get-file-list - get-font-from-user - get-page-setup-from-user - get-panel-background - get-ps-setup-from-user - get-resource - get-text-from-user - get-the-editor-data-class-list - get-the-snip-class-list - get-top-level-edit-target-window - get-top-level-focus-window - get-top-level-windows - get-window-text-extent - gl-config% - gl-context<%> - graphical-read-eval-print-loop - group-box-panel% - grow-box-spacer-pane% - hide-cursor-until-moved - horizontal-pane% - horizontal-panel% - tab-panel% - image-snip% - is-busy? - is-color-display? - key-event% - keymap% - label->plain-label - labelled-menu-item<%> - list-box% - list-control<%> - make-eventspace - make-namespace-with-mred - map-command-as-meta-key - menu% - menu-bar% - menu-control-font - menu-item% - menu-item-container<%> - menu-item<%> - message% - message-box - message+check-box - message-box/custom - message+check-box/custom - mouse-event% - mult-color<%> - normal-control-font - open-input-graphical-file - open-input-text-editor - open-output-text-editor - pane% - panel% - pasteboard% - pen% - pen-list% - play-sound - point% - popup-menu% - post-script-dc% - printer-dc% - ps-setup% - put-file - queue-callback - radio-box% - readable-snip<%> - read-editor-global-footer - read-editor-global-header - read-editor-version - region% - register-collecting-blit - scroll-event% - selectable-menu-item<%> - send-event - send-message-to-window - separator-menu-item% - sleep/yield - slider% - small-control-font - snip% - snip-admin% - snip-class% - snip-class-list<%> - special-control-key - special-option-key - string-snip% - style-delta% - style-list% - style<%> - subarea<%> - subwindow<%> - tab-snip% - text% - text-editor-load-handler - text-field% - the-brush-list - the-clipboard - the-color-database - the-editor-wordbreak-map - the-font-list - the-font-name-directory - the-pen-list - the-style-list - the-x-selection-clipboard - timer% - tiny-control-font - top-level-window<%> - unregister-collecting-blit - vertical-pane% - vertical-panel% - view-control-font - window<%> - write-editor-global-footer - write-editor-global-header - write-editor-version - write-resource - yield - ) +#lang scheme/signature +add-color<%> +add-editor-keymap-functions +add-pasteboard-keymap-functions +add-text-keymap-functions +append-editor-font-menu-items +append-editor-operation-menu-items +application-about-handler +application-file-handler +application-preferences-handler +application-quit-handler +area-container-window<%> +area-container<%> +area<%> +begin-busy-cursor +bell +bitmap% +bitmap-dc% +brush% +brush-list% +button% +can-get-page-setup-from-user? +canvas% +canvas<%> +check-box% +check-for-break +checkable-menu-item% +choice% +clipboard-client% +clipboard<%> +color% +color-database<%> +combo-field% +control-event% +control<%> +current-eventspace +current-eventspace-has-menu-root? +current-eventspace-has-standard-menus? +current-ps-afm-file-paths +current-ps-cmap-file-paths +current-ps-setup +current-text-keymap-initializer +cursor% +dc<%> +dc-path% +dialog% +editor-admin% +editor-canvas% +editor-data% +editor-data-class% +editor-data-class-list<%> +editor-set-x-selection-mode +editor-snip% +editor-snip-editor-admin<%> +editor-stream-in% +editor-stream-in-base% +editor-stream-in-bytes-base% +editor-stream-out% +editor-stream-out-base% +editor-stream-out-bytes-base% +editor-wordbreak-map% +editor<%> +end-busy-cursor +event% +event-dispatch-handler +eventspace-handler-thread +eventspace-shutdown? +eventspace? +file-creator-and-type +find-graphical-system-path +flush-display +font% +font-list% +font-name-directory<%> +frame% +gauge% +get-choices-from-user +get-color-from-user +get-default-shortcut-prefix +get-directory +get-display-depth +get-display-left-top-inset +get-display-size +get-face-list +get-family-builtin-face +get-file +get-file-list +get-font-from-user +get-page-setup-from-user +get-panel-background +get-ps-setup-from-user +get-resource +get-text-from-user +get-the-editor-data-class-list +get-the-snip-class-list +get-top-level-edit-target-window +get-top-level-focus-window +get-top-level-windows +get-window-text-extent +gl-config% +gl-context<%> +graphical-read-eval-print-loop +group-box-panel% +grow-box-spacer-pane% +hide-cursor-until-moved +horizontal-pane% +horizontal-panel% +tab-panel% +image-snip% +is-busy? +is-color-display? +key-event% +keymap% +label->plain-label +labelled-menu-item<%> +list-box% +list-control<%> +make-eventspace +make-namespace-with-mred +map-command-as-meta-key +menu% +menu-bar% +menu-control-font +menu-item% +menu-item-container<%> +menu-item<%> +message% +message-box +message+check-box +message-box/custom +message+check-box/custom +mouse-event% +mult-color<%> +normal-control-font +open-input-graphical-file +open-input-text-editor +open-output-text-editor +pane% +panel% +pasteboard% +pen% +pen-list% +play-sound +point% +popup-menu% +post-script-dc% +printer-dc% +ps-setup% +put-file +queue-callback +radio-box% +readable-snip<%> +read-editor-global-footer +read-editor-global-header +read-editor-version +region% +register-collecting-blit +scroll-event% +selectable-menu-item<%> +send-event +send-message-to-window +separator-menu-item% +sleep/yield +slider% +small-control-font +snip% +snip-admin% +snip-class% +snip-class-list<%> +special-control-key +special-option-key +string-snip% +style-delta% +style-list% +style<%> +subarea<%> +subwindow<%> +tab-snip% +text% +text-editor-load-handler +text-field% +the-brush-list +the-clipboard +the-color-database +the-editor-wordbreak-map +the-font-list +the-font-name-directory +the-pen-list +the-style-list +the-x-selection-clipboard +timer% +tiny-control-font +top-level-window<%> +unregister-collecting-blit +vertical-pane% +vertical-panel% +view-control-font +window<%> +write-editor-global-footer +write-editor-global-header +write-editor-version +write-resource +yield diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index 8701aa7f..f10f1c52 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -36,11 +36,9 @@ (wx:set-dialogs get-file put-file get-ps-setup-from-user message-box) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (define mred-module-name ((current-module-name-resolver) - '(lib "mred.ss" "mred") #f #f)) - (define class-module-name ((current-module-name-resolver) - '(lib "class.ss") #f #f)) + + (define mred-module-name '(lib "mred/mred.ss")) + (define class-module-name '(lib "scheme/class.ss")) (define make-namespace-with-mred (opt-lambda ([flag 'mred]) diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index 28926eb3..c6807f4d 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -9,11 +9,11 @@ ;; the library compiles with setup-plt in mzscheme. (define kernel:initialize-primitive-object - (dynamic-require '#%mred-kernel 'initialize-primitive-object)) + (dynamic-require ''#%mred-kernel 'initialize-primitive-object)) (define kernel:primitive-class-find-method - (dynamic-require '#%mred-kernel 'primitive-class-find-method)) + (dynamic-require ''#%mred-kernel 'primitive-class-find-method)) (define kernel:primitive-class-prepare-struct-type! - (dynamic-require '#%mred-kernel 'primitive-class-prepare-struct-type!)) + (dynamic-require ''#%mred-kernel 'primitive-class-prepare-struct-type!)) (define-syntax define-constant (lambda (stx) @@ -28,7 +28,7 @@ #f)]) (syntax (begin - (define kernel:name (dynamic-require '#%mred-kernel 'name)) + (define kernel:name (dynamic-require ''#%mred-kernel 'name)) (provide (protect (rename kernel:name name))))))]))) (define-syntax define-function @@ -76,7 +76,7 @@ (with-syntax ([(old ...) (datum->syntax-object #f old #f)] [(new ...) (datum->syntax-object #f new #f)]) (syntax - (define name (let ([c (dynamic-require '#%mred-kernel 'name)]) + (define name (let ([c (dynamic-require ''#%mred-kernel 'name)]) (make-primitive-class (lambda (class prop:object preparer dispatcher) (kernel:primitive-class-prepare-struct-type! diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index c081792e..3e05e328 100644 --- a/collects/mred/private/mritem.ss +++ b/collects/mred/private/mritem.ss @@ -373,12 +373,15 @@ [-append-list-string (lambda (i) (set! content (append content (list i))))] [-set-list-string (lambda (i s) - (set-car! (list-tail content i) (string->immutable-string s)))] + (set! content (let loop ([content content][i i]) + (if (zero? i) + (cons (string->immutable-string s) (cdr content)) + (cons (car content) (loop (cdr content) (sub1 i)))))))] [-delete-list-item (lambda (pos) - (if (zero? pos) - (set! content (cdr content)) - (set-cdr! (list-tail content (sub1 pos)) - (list-tail content (add1 pos)))))] + (set! content (let loop ([content content][pos pos]) + (if (zero? pos) + (cdr content) + (cons (car content) (loop (cdr content) (sub1 pos)))))))] [-set-list-strings (lambda (l) (set! content (map string->immutable-string l)))]) (private-field diff --git a/collects/mred/private/mrmenu.ss b/collects/mred/private/mrmenu.ss index 708af73f..bf531e12 100644 --- a/collects/mred/private/mrmenu.ss +++ b/collects/mred/private/mrmenu.ss @@ -110,7 +110,7 @@ (lambda (l) (check-label-string '(method labelled-menu-item<%> set-label) l) (set! label (string->immutable-string l)) - (set-car! (send wx get-menu-data) l) ; for meta-shortcuts + (set-mcar! (send wx get-menu-data) l) ; for meta-shortcuts (set! plain-label (string->immutable-string (wx:label->plain-label l))) (when shown? (if in-menu? @@ -152,7 +152,7 @@ (lambda () (when help-string (set! help-string (string->immutable-string help-string))) - (set! wx (set-wx (make-object wx-menu-item% this (cons label #f) #t))) + (set! wx (set-wx (make-object wx-menu-item% this (mcons label #f) #t))) (set! wx-parent (send (mred->wx parent) get-container)) (super-init wx) (when keymap (send wx set-keymap keymap)))) @@ -212,9 +212,9 @@ (define default-prefix (case (system-type) - [(unix) (list-immutable default-x-prefix)] - [(windows) (list-immutable 'ctl)] - [(macosx) (list-immutable 'cmd)])) + [(unix) (list default-x-prefix)] + [(windows) (list 'ctl)] + [(macosx) (list 'cmd)])) (define (get-default-shortcut-prefix) default-prefix) @@ -238,7 +238,7 @@ (check-instance '(method selectable-menu-item<%> command) wx:control-event% 'control-event% #f e) (void (callback this e)))]) (private-field - [prefix (apply list-immutable shrtcut-prefix)]) + [prefix shrtcut-prefix]) (private [calc-labels (lambda (label) (let* ([new-label (if shortcut @@ -392,7 +392,7 @@ (set! wx-menu (make-object wx-menu% this #f void #f)) (super-init parent label help-string wx-menu #f (send wx-menu get-keymap) (lambda (x) x) void) (let ([wx-item (mred->wx this)]) - (set-cdr! (send wx-item get-menu-data) wx-menu) ; for meta-shortcuts + (set-mcdr! (send wx-item get-menu-data) wx-menu) ; for meta-shortcuts (send wx-item set-wx-menu wx-menu))))))) (define menu-bar% diff --git a/collects/mred/private/mrpanel.ss b/collects/mred/private/mrpanel.ss index b5454072..f557e882 100644 --- a/collects/mred/private/mrpanel.ss +++ b/collects/mred/private/mrpanel.ss @@ -154,7 +154,10 @@ (check-item 'set-item-label i) (check-label-string '(method tab-panel% set-item-label) s) (let ([s (string->immutable-string s)]) - (set-car! (list-tail save-choices i) s) + (set! save-choices (let loop ([save-choices save-choices][i i]) + (if (zero? i) + (cons s (cdr save-choices)) + (cons (car save-choices) (loop (cdr save-choices) (sub1 i)))))) (send (mred->wx tabs) set-label i s))))] [set (entry-point (lambda (l) diff --git a/collects/mred/private/path-dialog.ss b/collects/mred/private/path-dialog.ss index fd6eedae..4c5d5957 100644 --- a/collects/mred/private/path-dialog.ss +++ b/collects/mred/private/path-dialog.ss @@ -245,7 +245,7 @@ (directory-list))] [pnames '()]) (if (null? paths) - (let ([ps (sort! pnames pnamecomplete-path filename))]) (if expected-module (with-module-reading-parameterization (lambda () diff --git a/collects/mzscheme/lang/reader.ss b/collects/mzscheme/lang/reader.ss index d68946ec..6a8e851c 100644 --- a/collects/mzscheme/lang/reader.ss +++ b/collects/mzscheme/lang/reader.ss @@ -1,5 +1,2 @@ -(module reader mzscheme - (require (lib "module-reader.ss" "syntax")) - - (provide-module-reader mzscheme)) - +(module reader syntax/module-reader + mzscheme) diff --git a/collects/scheme/gui.ss b/collects/scheme/gui.ss new file mode 100644 index 00000000..b6f78978 --- /dev/null +++ b/collects/scheme/gui.ss @@ -0,0 +1,4 @@ +(module gui scheme + (require mred) + (provide (all-from-out scheme) + (all-from-out mred))) diff --git a/collects/scheme/gui/init.ss b/collects/scheme/gui/init.ss new file mode 100644 index 00000000..47572d10 --- /dev/null +++ b/collects/scheme/gui/init.ss @@ -0,0 +1,8 @@ + +(module init scheme/gui + (require (only-in scheme/init)) + + (current-load text-editor-load-handler) + + (provide (all-from-out scheme/gui) + (all-from-out scheme/init))) diff --git a/collects/scheme/gui/lang/reader.ss b/collects/scheme/gui/lang/reader.ss new file mode 100644 index 00000000..51f651c1 --- /dev/null +++ b/collects/scheme/gui/lang/reader.ss @@ -0,0 +1,2 @@ +(module reader syntax/module-reader + scheme/gui) diff --git a/collects/scribblings/gui/add-color-intf.scrbl b/collects/scribblings/gui/add-color-intf.scrbl index 3c6d55fe..c3e8e7bc 100644 --- a/collects/scribblings/gui/add-color-intf.scrbl +++ b/collects/scribblings/gui/add-color-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[add-color<%> ()]{ diff --git a/collects/scribblings/gui/area-container-intf.scrbl b/collects/scribblings/gui/area-container-intf.scrbl index 2727d310..76826cbf 100644 --- a/collects/scribblings/gui/area-container-intf.scrbl +++ b/collects/scribblings/gui/area-container-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[area-container<%> (area<%>)]{ diff --git a/collects/scribblings/gui/area-container-window-intf.scrbl b/collects/scribblings/gui/area-container-window-intf.scrbl index 80719605..60d48e4f 100644 --- a/collects/scribblings/gui/area-container-window-intf.scrbl +++ b/collects/scribblings/gui/area-container-window-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[area-container-window<%> (area-container<%> window<%>)]{ diff --git a/collects/scribblings/gui/area-intf.scrbl b/collects/scribblings/gui/area-intf.scrbl index cb1f60fd..ea6d4bfa 100644 --- a/collects/scribblings/gui/area-intf.scrbl +++ b/collects/scribblings/gui/area-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[area<%> ()]{ diff --git a/collects/scribblings/gui/blurbs.ss b/collects/scribblings/gui/blurbs.ss index 447e41b9..a0559fee 100644 --- a/collects/scribblings/gui/blurbs.ss +++ b/collects/scribblings/gui/blurbs.ss @@ -1,12 +1,12 @@ -#reader(lib "reader.ss" "scribble") -(module blurbs (lib "lang.ss" "big") - (require (lib "struct.ss" "scribble") - (lib "manual.ss" "scribble") - (lib "scheme.ss" "scribble") - (lib "decode.ss" "scribble")) - (require-for-label (lib "mred.ss" "mred")) +#readerscribble/reader +(module blurbs scheme/base + (require scribble/struct + scribble/manual + scribble/scheme + scribble/decode + (for-label mred)) - (provide (all-defined-except p)) + (provide (except-out (all-defined-out) p)) (define (p . l) (decode-paragraph l)) @@ -160,7 +160,7 @@ information@|details|, even if the editor currently has delayed refreshing (see @item{@method[dc<%> end-doc]}} @p{Attempts to use a drawing method outside of an active page raises an exception.}))) - (define reference-doc '(lib "reference.scrbl" "scribblings" "reference")) + (define reference-doc '(lib "scribblings/reference/reference.scrbl")) (define SeeMzParam @elem{(see @secref[#:doc reference-doc "parameters"])}) diff --git a/collects/scribblings/gui/button-class.scrbl b/collects/scribblings/gui/button-class.scrbl index cfc8b2d6..fd6e117a 100644 --- a/collects/scribblings/gui/button-class.scrbl +++ b/collects/scribblings/gui/button-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[button% object% (control<%>)]{ diff --git a/collects/scribblings/gui/canvas-class.scrbl b/collects/scribblings/gui/canvas-class.scrbl index 0cfc9ad8..33d1facf 100644 --- a/collects/scribblings/gui/canvas-class.scrbl +++ b/collects/scribblings/gui/canvas-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[canvas% object% (canvas<%>)]{ diff --git a/collects/scribblings/gui/canvas-intf.scrbl b/collects/scribblings/gui/canvas-intf.scrbl index f4c62587..5d3be6a1 100644 --- a/collects/scribblings/gui/canvas-intf.scrbl +++ b/collects/scribblings/gui/canvas-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[canvas<%> (subwindow<%>)]{ diff --git a/collects/scribblings/gui/check-box-class.scrbl b/collects/scribblings/gui/check-box-class.scrbl index 37b30f64..87c1b005 100644 --- a/collects/scribblings/gui/check-box-class.scrbl +++ b/collects/scribblings/gui/check-box-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[check-box% object% (control<%>)]{ diff --git a/collects/scribblings/gui/checkable-menu-item-class.scrbl b/collects/scribblings/gui/checkable-menu-item-class.scrbl index 2abff568..21dabbd1 100644 --- a/collects/scribblings/gui/checkable-menu-item-class.scrbl +++ b/collects/scribblings/gui/checkable-menu-item-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[checkable-menu-item% object% (selectable-menu-item<%>)]{ diff --git a/collects/scribblings/gui/choice-class.scrbl b/collects/scribblings/gui/choice-class.scrbl index 27594d3f..96cfcb75 100644 --- a/collects/scribblings/gui/choice-class.scrbl +++ b/collects/scribblings/gui/choice-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[choice% object% (list-control<%>)]{ diff --git a/collects/scribblings/gui/clipboard-client-class.scrbl b/collects/scribblings/gui/clipboard-client-class.scrbl index b4fb0501..40b8050d 100644 --- a/collects/scribblings/gui/clipboard-client-class.scrbl +++ b/collects/scribblings/gui/clipboard-client-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[clipboard-client% object% ()]{ diff --git a/collects/scribblings/gui/clipboard-intf.scrbl b/collects/scribblings/gui/clipboard-intf.scrbl index 7b97a438..c9b3ab92 100644 --- a/collects/scribblings/gui/clipboard-intf.scrbl +++ b/collects/scribblings/gui/clipboard-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[clipboard<%> ()]{ diff --git a/collects/scribblings/gui/combo-field-class.scrbl b/collects/scribblings/gui/combo-field-class.scrbl index 13a36fd3..52e39051 100644 --- a/collects/scribblings/gui/combo-field-class.scrbl +++ b/collects/scribblings/gui/combo-field-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[combo-field% text-field% ()]{ diff --git a/collects/scribblings/gui/common.ss b/collects/scribblings/gui/common.ss index 44a3edc1..2a0bdb37 100644 --- a/collects/scribblings/gui/common.ss +++ b/collects/scribblings/gui/common.ss @@ -1,22 +1,22 @@ -(module common mzscheme - (require (lib "manual.ss" "scribble") - (lib "basic.ss" "scribble") - (lib "class.ss") - (lib "contract.ss") +(module common scheme/base + (require scribble/manual + scribble/basic + mzlib/class + mzlib/contract "blurbs.ss" - (only "../reference/mz.ss" AllUnix exnraise)) - (provide (all-from (lib "manual.ss" "scribble")) - (all-from (lib "basic.ss" "scribble")) - (all-from (lib "class.ss")) - (all-from (lib "contract.ss")) - (all-from "blurbs.ss") - (all-from "../reference/mz.ss")) + (only-in "../reference/mz.ss" AllUnix exnraise)) + (provide (all-from-out scribble/manual) + (all-from-out scribble/basic) + (all-from-out mzlib/class) + (all-from-out mzlib/contract) + (all-from-out "blurbs.ss") + (all-from-out "../reference/mz.ss")) - (require-for-label (lib "mred.ss" "mred") - (lib "class.ss") - (lib "lang.ss" "big")) - (provide-for-label (all-from (lib "mred.ss" "mred")) - (all-from (lib "class.ss")) - (all-from (lib "lang.ss" "big")))) + (require (for-label mred + mzlib/class + scheme/base)) + (provide (for-label (all-from-out mred) + (all-from-out mzlib/class) + (all-from-out scheme/base)))) diff --git a/collects/scribblings/gui/control-event-class.scrbl b/collects/scribblings/gui/control-event-class.scrbl index e7c88732..a177b7fd 100644 --- a/collects/scribblings/gui/control-event-class.scrbl +++ b/collects/scribblings/gui/control-event-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[control-event% event% ()]{ diff --git a/collects/scribblings/gui/control-intf.scrbl b/collects/scribblings/gui/control-intf.scrbl index 02204dc1..0c27d667 100644 --- a/collects/scribblings/gui/control-intf.scrbl +++ b/collects/scribblings/gui/control-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[control<%> (subwindow<%>)]{ diff --git a/collects/scribblings/gui/cursor-class.scrbl b/collects/scribblings/gui/cursor-class.scrbl index 9369c355..62aab678 100644 --- a/collects/scribblings/gui/cursor-class.scrbl +++ b/collects/scribblings/gui/cursor-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[cursor% object% ()]{ diff --git a/collects/scribblings/gui/diagrams.ss b/collects/scribblings/gui/diagrams.ss index 754f7303..9dd8592b 100644 --- a/collects/scribblings/gui/diagrams.ss +++ b/collects/scribblings/gui/diagrams.ss @@ -1,9 +1,8 @@ -(module diagrams mzscheme - (require (lib "string.ss") - (lib "struct.ss" "scribble") - (lib "scheme.ss" "scribble") - (lib "manual.ss" "scribble")) - (require-for-label (lib "mred.ss" "mred")) +(module diagrams scheme/base + (require scribble/struct + scribble/scheme + scribble/manual + (for-label mred)) (provide diagram->table short-windowing-diagram diff --git a/collects/scribblings/gui/dialog-class.scrbl b/collects/scribblings/gui/dialog-class.scrbl index 6099cb21..e7443594 100644 --- a/collects/scribblings/gui/dialog-class.scrbl +++ b/collects/scribblings/gui/dialog-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[dialog% object% (top-level-window<%>)]{ diff --git a/collects/scribblings/gui/dialog-funcs.scrbl b/collects/scribblings/gui/dialog-funcs.scrbl index e9c899ff..eec0d4cc 100644 --- a/collects/scribblings/gui/dialog-funcs.scrbl +++ b/collects/scribblings/gui/dialog-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title{Dialogs} @@ -503,4 +503,4 @@ Returns @scheme[#t] if the current platform (Mac OS X) supports a created. Returns @scheme[#f] if no separate page-layout dialog is needed (Windows and Unix). -} \ No newline at end of file +} diff --git a/collects/scribblings/gui/editor-admin-class.scrbl b/collects/scribblings/gui/editor-admin-class.scrbl index 74ad865d..edba0124 100644 --- a/collects/scribblings/gui/editor-admin-class.scrbl +++ b/collects/scribblings/gui/editor-admin-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-admin% object% ()]{ diff --git a/collects/scribblings/gui/editor-canvas-class.scrbl b/collects/scribblings/gui/editor-canvas-class.scrbl index c0fe65d8..6fccf027 100644 --- a/collects/scribblings/gui/editor-canvas-class.scrbl +++ b/collects/scribblings/gui/editor-canvas-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-canvas% object% (canvas<%>)]{ diff --git a/collects/scribblings/gui/editor-classes.scrbl b/collects/scribblings/gui/editor-classes.scrbl index c8b23f91..c8e2a52f 100644 --- a/collects/scribblings/gui/editor-classes.scrbl +++ b/collects/scribblings/gui/editor-classes.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @require["diagrams.ss"] diff --git a/collects/scribblings/gui/editor-data-class-class.scrbl b/collects/scribblings/gui/editor-data-class-class.scrbl index 749fedb6..96287981 100644 --- a/collects/scribblings/gui/editor-data-class-class.scrbl +++ b/collects/scribblings/gui/editor-data-class-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-data-class% object% ()]{ diff --git a/collects/scribblings/gui/editor-data-class-list-intf.scrbl b/collects/scribblings/gui/editor-data-class-list-intf.scrbl index db108a00..f64b0d45 100644 --- a/collects/scribblings/gui/editor-data-class-list-intf.scrbl +++ b/collects/scribblings/gui/editor-data-class-list-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[editor-data-class-list<%> ()]{ diff --git a/collects/scribblings/gui/editor-data-class.scrbl b/collects/scribblings/gui/editor-data-class.scrbl index f350a39b..60cb0ccb 100644 --- a/collects/scribblings/gui/editor-data-class.scrbl +++ b/collects/scribblings/gui/editor-data-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-data% object% ()]{ diff --git a/collects/scribblings/gui/editor-funcs.scrbl b/collects/scribblings/gui/editor-funcs.scrbl index f529f036..a22fc95d 100644 --- a/collects/scribblings/gui/editor-funcs.scrbl +++ b/collects/scribblings/gui/editor-funcs.scrbl @@ -1,6 +1,6 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] -@require[(lib "bnf.ss" "scribble")] +@require[scribble/bnf] @title{Editor Functions} diff --git a/collects/scribblings/gui/editor-intf.scrbl b/collects/scribblings/gui/editor-intf.scrbl index 97cfeaa3..cc3d8ebe 100644 --- a/collects/scribblings/gui/editor-intf.scrbl +++ b/collects/scribblings/gui/editor-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[editor<%> ()]{ diff --git a/collects/scribblings/gui/editor-overview.scrbl b/collects/scribblings/gui/editor-overview.scrbl index df537fd0..25e47b8a 100644 --- a/collects/scribblings/gui/editor-overview.scrbl +++ b/collects/scribblings/gui/editor-overview.scrbl @@ -1,5 +1,5 @@ -#reader(lib "docreader.ss" "scribble") -@require[(lib "bnf.ss" "scribble")] +#lang scribble/doc +@require[scribble/bnf] @require["common.ss"] @title[#:tag "editor-overview"]{Editor} diff --git a/collects/scribblings/gui/editor-snip-class.scrbl b/collects/scribblings/gui/editor-snip-class.scrbl index 18e73a52..1e09f23f 100644 --- a/collects/scribblings/gui/editor-snip-class.scrbl +++ b/collects/scribblings/gui/editor-snip-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-snip% snip% ()]{ diff --git a/collects/scribblings/gui/editor-snip-editor-admin-intf.scrbl b/collects/scribblings/gui/editor-snip-editor-admin-intf.scrbl index 12104c6a..f225ecc6 100644 --- a/collects/scribblings/gui/editor-snip-editor-admin-intf.scrbl +++ b/collects/scribblings/gui/editor-snip-editor-admin-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[editor-snip-editor-admin<%> ()]{ diff --git a/collects/scribblings/gui/editor-stream-in-base-class.scrbl b/collects/scribblings/gui/editor-stream-in-base-class.scrbl index 355e3ee0..f7c278a4 100644 --- a/collects/scribblings/gui/editor-stream-in-base-class.scrbl +++ b/collects/scribblings/gui/editor-stream-in-base-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-in-base% object% ()]{ diff --git a/collects/scribblings/gui/editor-stream-in-bytes-base-class.scrbl b/collects/scribblings/gui/editor-stream-in-bytes-base-class.scrbl index d1d97126..b34a43fe 100644 --- a/collects/scribblings/gui/editor-stream-in-bytes-base-class.scrbl +++ b/collects/scribblings/gui/editor-stream-in-bytes-base-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-in-bytes-base% editor-stream-in-base% ()]{ diff --git a/collects/scribblings/gui/editor-stream-in-class.scrbl b/collects/scribblings/gui/editor-stream-in-class.scrbl index 0427dfd9..9bb01424 100644 --- a/collects/scribblings/gui/editor-stream-in-class.scrbl +++ b/collects/scribblings/gui/editor-stream-in-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-in% object% ()]{ diff --git a/collects/scribblings/gui/editor-stream-out-base-class.scrbl b/collects/scribblings/gui/editor-stream-out-base-class.scrbl index fcd279e3..5d2a8fd7 100644 --- a/collects/scribblings/gui/editor-stream-out-base-class.scrbl +++ b/collects/scribblings/gui/editor-stream-out-base-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-out-base% object% ()]{ diff --git a/collects/scribblings/gui/editor-stream-out-bytes-base-class.scrbl b/collects/scribblings/gui/editor-stream-out-bytes-base-class.scrbl index c6fef1ba..18ab4802 100644 --- a/collects/scribblings/gui/editor-stream-out-bytes-base-class.scrbl +++ b/collects/scribblings/gui/editor-stream-out-bytes-base-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-out-bytes-base% editor-stream-out-base% ()]{ diff --git a/collects/scribblings/gui/editor-stream-out-class.scrbl b/collects/scribblings/gui/editor-stream-out-class.scrbl index 3736046d..253e84fb 100644 --- a/collects/scribblings/gui/editor-stream-out-class.scrbl +++ b/collects/scribblings/gui/editor-stream-out-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-stream-out% object% ()]{ diff --git a/collects/scribblings/gui/editor-wordbreak-map-class.scrbl b/collects/scribblings/gui/editor-wordbreak-map-class.scrbl index 3e319901..355699ae 100644 --- a/collects/scribblings/gui/editor-wordbreak-map-class.scrbl +++ b/collects/scribblings/gui/editor-wordbreak-map-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[editor-wordbreak-map% object% ()]{ diff --git a/collects/scribblings/gui/event-class.scrbl b/collects/scribblings/gui/event-class.scrbl index d5fea2bb..21372c80 100644 --- a/collects/scribblings/gui/event-class.scrbl +++ b/collects/scribblings/gui/event-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[event% object% ()]{ diff --git a/collects/scribblings/gui/eventspace-funcs.scrbl b/collects/scribblings/gui/eventspace-funcs.scrbl index 1ea813af..764ebb77 100644 --- a/collects/scribblings/gui/eventspace-funcs.scrbl +++ b/collects/scribblings/gui/eventspace-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title[#:tag "eventspace-funcs"]{Eventspaces} @@ -230,4 +230,4 @@ Returns the handler thread of the given eventspace. If the handler -} \ No newline at end of file +} diff --git a/collects/scribblings/gui/font-funcs.scrbl b/collects/scribblings/gui/font-funcs.scrbl index e0a3c58b..c955bbd7 100644 --- a/collects/scribblings/gui/font-funcs.scrbl +++ b/collects/scribblings/gui/font-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title{Fonts} diff --git a/collects/scribblings/gui/frame-class.scrbl b/collects/scribblings/gui/frame-class.scrbl index 336ddfa6..2a02347e 100644 --- a/collects/scribblings/gui/frame-class.scrbl +++ b/collects/scribblings/gui/frame-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[frame% object% (top-level-window<%>)]{ diff --git a/collects/scribblings/gui/gauge-class.scrbl b/collects/scribblings/gui/gauge-class.scrbl index 3b6c9ace..274a8e23 100644 --- a/collects/scribblings/gui/gauge-class.scrbl +++ b/collects/scribblings/gui/gauge-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[gauge% object% (control<%>)]{ diff --git a/collects/scribblings/gui/global-draw-funcs.scrbl b/collects/scribblings/gui/global-draw-funcs.scrbl index f04d7e19..11eabfa5 100644 --- a/collects/scribblings/gui/global-draw-funcs.scrbl +++ b/collects/scribblings/gui/global-draw-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title{Global Graphics} diff --git a/collects/scribblings/gui/group-box-panel-class.scrbl b/collects/scribblings/gui/group-box-panel-class.scrbl index 110997a7..a5245c68 100644 --- a/collects/scribblings/gui/group-box-panel-class.scrbl +++ b/collects/scribblings/gui/group-box-panel-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[group-box-panel% vertical-panel% ()]{ diff --git a/collects/scribblings/gui/grow-box-spacer-pane-class.scrbl b/collects/scribblings/gui/grow-box-spacer-pane-class.scrbl index 445234af..7ea5a5db 100644 --- a/collects/scribblings/gui/grow-box-spacer-pane-class.scrbl +++ b/collects/scribblings/gui/grow-box-spacer-pane-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[grow-box-spacer-pane% pane% ()]{ diff --git a/collects/scribblings/gui/gui.scrbl b/collects/scribblings/gui/gui.scrbl index 1d0c02fb..6cf4e1a4 100644 --- a/collects/scribblings/gui/gui.scrbl +++ b/collects/scribblings/gui/gui.scrbl @@ -1,15 +1,15 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] -@title[#:tag-prefix '(lib "gui.scrbl" "scribblings" "gui") +@title[#:tag-prefix '(lib "scribblings/gui/gui.scrbl") #:tag "top"]{PLT Scheme GUI: MrEd} @declare-exporting[(lib "mred")] This reference manual describes the MrEd GUI toolbox that is part of - PLT Scheme. See @secref[#:doc '(lib "guide.scrbl" "scribblings" - "guide") "mred"] in @italic{@link["../guide/index.html"]{A Guide to - PLT Scheme}} for an introduction to MrEd. + PLT Scheme. See @secref[#:doc '(lib "scribblings/guide/guide.scrbl") + "mred"] in @italic{@link["../guide/index.html"]{A Guide to PLT + Scheme}} for an introduction to MrEd. The @scheme[(lib "mred")] module provides all of the class, interface, and procedure bindings defined in this manual. The diff --git a/collects/scribblings/gui/guide.scrbl b/collects/scribblings/gui/guide.scrbl index afd4eea6..0e8b02ce 100644 --- a/collects/scribblings/gui/guide.scrbl +++ b/collects/scribblings/gui/guide.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title[#:style '(toc reveal)]{Overview} diff --git a/collects/scribblings/gui/horizontal-pane-class.scrbl b/collects/scribblings/gui/horizontal-pane-class.scrbl index 6d861146..3d5bf6e4 100644 --- a/collects/scribblings/gui/horizontal-pane-class.scrbl +++ b/collects/scribblings/gui/horizontal-pane-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[horizontal-pane% pane% ()]{ diff --git a/collects/scribblings/gui/horizontal-panel-class.scrbl b/collects/scribblings/gui/horizontal-panel-class.scrbl index c68b45d3..7ce293e1 100644 --- a/collects/scribblings/gui/horizontal-panel-class.scrbl +++ b/collects/scribblings/gui/horizontal-panel-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[horizontal-panel% panel% ()]{ diff --git a/collects/scribblings/gui/image-snip-class.scrbl b/collects/scribblings/gui/image-snip-class.scrbl index 493f78c8..d8699ad2 100644 --- a/collects/scribblings/gui/image-snip-class.scrbl +++ b/collects/scribblings/gui/image-snip-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[image-snip% snip% ()]{ diff --git a/collects/scribblings/gui/info.ss b/collects/scribblings/gui/info.ss index 5ac00bf4..9657d80d 100644 --- a/collects/scribblings/gui/info.ss +++ b/collects/scribblings/gui/info.ss @@ -1,4 +1,4 @@ -(module info (lib "infotab.ss" "setup") +(module info setup/infotab (define name "Scribblings: GUI") (define scribblings '(("gui.scrbl" (multi-page main-doc))))) diff --git a/collects/scribblings/gui/key-event-class.scrbl b/collects/scribblings/gui/key-event-class.scrbl index 56ba23c3..0ec488ce 100644 --- a/collects/scribblings/gui/key-event-class.scrbl +++ b/collects/scribblings/gui/key-event-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[key-event% event% ()]{ diff --git a/collects/scribblings/gui/keymap-class.scrbl b/collects/scribblings/gui/keymap-class.scrbl index 070ecbb3..bbe6a576 100644 --- a/collects/scribblings/gui/keymap-class.scrbl +++ b/collects/scribblings/gui/keymap-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[keymap% object% ()]{ diff --git a/collects/scribblings/gui/labelled-menu-item-intf.scrbl b/collects/scribblings/gui/labelled-menu-item-intf.scrbl index 3a6bf570..5253ea92 100644 --- a/collects/scribblings/gui/labelled-menu-item-intf.scrbl +++ b/collects/scribblings/gui/labelled-menu-item-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[labelled-menu-item<%> (menu-item<%>)]{ diff --git a/collects/scribblings/gui/list-box-class.scrbl b/collects/scribblings/gui/list-box-class.scrbl index e7045813..75a056a6 100644 --- a/collects/scribblings/gui/list-box-class.scrbl +++ b/collects/scribblings/gui/list-box-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @define[lbnumnote @elem{List box items are indexed from @scheme[0].}] diff --git a/collects/scribblings/gui/list-control-intf.scrbl b/collects/scribblings/gui/list-control-intf.scrbl index 8f984c19..e44703b5 100644 --- a/collects/scribblings/gui/list-control-intf.scrbl +++ b/collects/scribblings/gui/list-control-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[list-control<%> (control<%>)]{ diff --git a/collects/scribblings/gui/menu-bar-class.scrbl b/collects/scribblings/gui/menu-bar-class.scrbl index 6668d8f6..f7573825 100644 --- a/collects/scribblings/gui/menu-bar-class.scrbl +++ b/collects/scribblings/gui/menu-bar-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[menu-bar% object% (menu-item-container<%>)]{ diff --git a/collects/scribblings/gui/menu-class.scrbl b/collects/scribblings/gui/menu-class.scrbl index 461e5d9c..479f4cac 100644 --- a/collects/scribblings/gui/menu-class.scrbl +++ b/collects/scribblings/gui/menu-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[menu% object% (menu-item-container<%> labelled-menu-item<%>)]{ diff --git a/collects/scribblings/gui/menu-item-class.scrbl b/collects/scribblings/gui/menu-item-class.scrbl index 1aafc024..56063024 100644 --- a/collects/scribblings/gui/menu-item-class.scrbl +++ b/collects/scribblings/gui/menu-item-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[menu-item% object% (selectable-menu-item<%>)]{ diff --git a/collects/scribblings/gui/menu-item-container-intf.scrbl b/collects/scribblings/gui/menu-item-container-intf.scrbl index 25dfab95..997e6425 100644 --- a/collects/scribblings/gui/menu-item-container-intf.scrbl +++ b/collects/scribblings/gui/menu-item-container-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[menu-item-container<%> ()]{ diff --git a/collects/scribblings/gui/menu-item-intf.scrbl b/collects/scribblings/gui/menu-item-intf.scrbl index 6acef1b1..086f499f 100644 --- a/collects/scribblings/gui/menu-item-intf.scrbl +++ b/collects/scribblings/gui/menu-item-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[menu-item<%> ()]{ diff --git a/collects/scribblings/gui/message-class.scrbl b/collects/scribblings/gui/message-class.scrbl index f410106c..f2eaec4f 100644 --- a/collects/scribblings/gui/message-class.scrbl +++ b/collects/scribblings/gui/message-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[message% object% (control<%>)]{ diff --git a/collects/scribblings/gui/miscwin-funcs.scrbl b/collects/scribblings/gui/miscwin-funcs.scrbl index b6e11156..4b4d14ad 100644 --- a/collects/scribblings/gui/miscwin-funcs.scrbl +++ b/collects/scribblings/gui/miscwin-funcs.scrbl @@ -1,6 +1,6 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] -@require[(lib "struct.ss" "scribble")] +@require[scribble/struct] @define[(atable . l) (make-table #f (map (lambda (i) @@ -31,7 +31,7 @@ Plays a sound file. If @scheme[async?] is false, the function does not The result is @scheme[#t] if the sound plays successfully, @scheme[#f] otherwise. -Under Windows, only @file{.wav} files are supported. +Under Windows, only @filepath{.wav} files are supported. Under X, the function invokes an external sound-playing program; looking for a few known programs (@exec{aplay}, @exec{play}, @@ -142,11 +142,11 @@ Gets a resource value from the resource database. The resource value If @scheme[file] is @scheme[#f], platform-specific resource files are read, as determined by @scheme[find-graphical-system-path] with @indexed-scheme['setup-file]. (Under X, when @scheme[file] is - @scheme[#f], the user's @file{.Xdefaults} file is also read, or the - file specified by the @file{XENVIRONMENT} environment variable.) + @scheme[#f], the user's @filepath{.Xdefaults} file is also read, or the + file specified by the @filepath{XENVIRONMENT} environment variable.) The format of a resource entry depends on the platform. Windows - resources use the standard @file{.ini} format. X and Mac OS X + resources use the standard @filepath{.ini} format. X and Mac OS X resources use the standard X resource format, where each entry consists of a @scheme[section].@scheme[entry] resource name, a colon, and the resource value, terminated by a newline. Section and entry names are @@ -429,17 +429,17 @@ If the AppleEvent reply contains a value that cannot be Like @scheme[make-namespace], but the @scheme[(lib "mred.ss" "mred")] module of the current namespace is attached. In addition, by - default, the namespace is initialized by importing the @file{mred.ss} + default, the namespace is initialized by importing the @filepath{mred.ss} module and MzLib's @indexed-file{class.ss} module into the namespace's top-level environment. The @scheme['initial] and @scheme['empty] flags control the namespace creation in the same way as for @scheme[make-namespace], except that - the @file{mred.ss} module is attached to the created namespace (along + the @filepath{mred.ss} module is attached to the created namespace (along with the transitive closure of its imports). The @scheme['mred] flag - is like @scheme['initial], but also imports the @file{mred.ss} module + is like @scheme['initial], but also imports the @filepath{mred.ss} module and MzLib's @indexed-file{class.ss} module into the namespace's top-level environment. -} \ No newline at end of file +} diff --git a/collects/scribblings/gui/mouse-event-class.scrbl b/collects/scribblings/gui/mouse-event-class.scrbl index baeb281e..fcf7aecc 100644 --- a/collects/scribblings/gui/mouse-event-class.scrbl +++ b/collects/scribblings/gui/mouse-event-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[mouse-event% event% ()]{ diff --git a/collects/scribblings/gui/mult-color-intf.scrbl b/collects/scribblings/gui/mult-color-intf.scrbl index 2ecf1914..e92cefb7 100644 --- a/collects/scribblings/gui/mult-color-intf.scrbl +++ b/collects/scribblings/gui/mult-color-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[mult-color<%> ()]{ diff --git a/collects/scribblings/gui/pane-class.scrbl b/collects/scribblings/gui/pane-class.scrbl index d4665726..7f7eeb00 100644 --- a/collects/scribblings/gui/pane-class.scrbl +++ b/collects/scribblings/gui/pane-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[pane% object% (area-container<%> subarea<%>)]{ diff --git a/collects/scribblings/gui/panel-class.scrbl b/collects/scribblings/gui/panel-class.scrbl index 09b80883..e846960e 100644 --- a/collects/scribblings/gui/panel-class.scrbl +++ b/collects/scribblings/gui/panel-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[panel% object% (area-container-window<%> subwindow<%>)]{ diff --git a/collects/scribblings/gui/pasteboard-class.scrbl b/collects/scribblings/gui/pasteboard-class.scrbl index 87afbaeb..4a44a97e 100644 --- a/collects/scribblings/gui/pasteboard-class.scrbl +++ b/collects/scribblings/gui/pasteboard-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[pasteboard% object% (editor<%>)]{ diff --git a/collects/scribblings/gui/popup-menu-class.scrbl b/collects/scribblings/gui/popup-menu-class.scrbl index 078241bd..83a0e8fb 100644 --- a/collects/scribblings/gui/popup-menu-class.scrbl +++ b/collects/scribblings/gui/popup-menu-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[popup-menu% object% (menu-item-container<%>)]{ diff --git a/collects/scribblings/gui/prefs.scrbl b/collects/scribblings/gui/prefs.scrbl index 38ff3d60..88beeab4 100644 --- a/collects/scribblings/gui/prefs.scrbl +++ b/collects/scribblings/gui/prefs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title[#:tag "mredprefs"]{Preferences} diff --git a/collects/scribblings/gui/printer-dc-class.scrbl b/collects/scribblings/gui/printer-dc-class.scrbl index d7cd196b..69d877cd 100644 --- a/collects/scribblings/gui/printer-dc-class.scrbl +++ b/collects/scribblings/gui/printer-dc-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[printer-dc% object% (dc<%>)]{ diff --git a/collects/scribblings/gui/radio-box-class.scrbl b/collects/scribblings/gui/radio-box-class.scrbl index 1171cfbf..7149ca4b 100644 --- a/collects/scribblings/gui/radio-box-class.scrbl +++ b/collects/scribblings/gui/radio-box-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[radio-box% object% (control<%>)]{ diff --git a/collects/scribblings/gui/readable-snip-intf.scrbl b/collects/scribblings/gui/readable-snip-intf.scrbl index 36d18f48..660bac53 100644 --- a/collects/scribblings/gui/readable-snip-intf.scrbl +++ b/collects/scribblings/gui/readable-snip-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[readable-snip<%> ()]{ @@ -17,7 +17,7 @@ A @scheme[readable-snip<%>] object is treated specially by the port The arguments are the same as the arguments to a procedure returned by a custom input port's @scheme[read]; see @secref[#:doc '(lib - "reference.scrbl" "scribblings" "reference") "customport"] for + "scribblings/reference/reference.scrbl") "customport"] for details. The result is also the same as the result from a @scheme[read]-produced procedure. diff --git a/collects/scribblings/gui/reference.scrbl b/collects/scribblings/gui/reference.scrbl index eafb0cb2..abb20e8c 100644 --- a/collects/scribblings/gui/reference.scrbl +++ b/collects/scribblings/gui/reference.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title[#:style '(toc reveal)]{Reference} diff --git a/collects/scribblings/gui/scroll-event-class.scrbl b/collects/scribblings/gui/scroll-event-class.scrbl index a82e74de..36f0cadc 100644 --- a/collects/scribblings/gui/scroll-event-class.scrbl +++ b/collects/scribblings/gui/scroll-event-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[scroll-event% event% ()]{ diff --git a/collects/scribblings/gui/selectable-menu-item-intf.scrbl b/collects/scribblings/gui/selectable-menu-item-intf.scrbl index ec7262f3..0af288ed 100644 --- a/collects/scribblings/gui/selectable-menu-item-intf.scrbl +++ b/collects/scribblings/gui/selectable-menu-item-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[selectable-menu-item<%> (labelled-menu-item<%>)]{ diff --git a/collects/scribblings/gui/separator-menu-item-class.scrbl b/collects/scribblings/gui/separator-menu-item-class.scrbl index 8dfd0fd0..69528630 100644 --- a/collects/scribblings/gui/separator-menu-item-class.scrbl +++ b/collects/scribblings/gui/separator-menu-item-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[separator-menu-item% object% (menu-item<%>)]{ diff --git a/collects/scribblings/gui/slider-class.scrbl b/collects/scribblings/gui/slider-class.scrbl index 4a4263c3..f2cf4744 100644 --- a/collects/scribblings/gui/slider-class.scrbl +++ b/collects/scribblings/gui/slider-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[slider% object% (control<%>)]{ diff --git a/collects/scribblings/gui/snip-admin-class.scrbl b/collects/scribblings/gui/snip-admin-class.scrbl index a2f06693..35cc8155 100644 --- a/collects/scribblings/gui/snip-admin-class.scrbl +++ b/collects/scribblings/gui/snip-admin-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[snip-admin% object% ()]{ diff --git a/collects/scribblings/gui/snip-class-class.scrbl b/collects/scribblings/gui/snip-class-class.scrbl index ac60c58f..d59736c7 100644 --- a/collects/scribblings/gui/snip-class-class.scrbl +++ b/collects/scribblings/gui/snip-class-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[snip-class% object% ()]{ @@ -143,4 +143,4 @@ The return value is @scheme[#f] if a write error occurs or anything else Returns @scheme[#t]. }} -} \ No newline at end of file +} diff --git a/collects/scribblings/gui/snip-class-list-intf.scrbl b/collects/scribblings/gui/snip-class-list-intf.scrbl index e4ce30c8..15c54b52 100644 --- a/collects/scribblings/gui/snip-class-list-intf.scrbl +++ b/collects/scribblings/gui/snip-class-list-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[snip-class-list<%> ()]{ diff --git a/collects/scribblings/gui/snip-class.scrbl b/collects/scribblings/gui/snip-class.scrbl index 56d67987..75692a37 100644 --- a/collects/scribblings/gui/snip-class.scrbl +++ b/collects/scribblings/gui/snip-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[snip% object% ()]{ diff --git a/collects/scribblings/gui/string-snip-class.scrbl b/collects/scribblings/gui/string-snip-class.scrbl index 926659e7..cdc407c2 100644 --- a/collects/scribblings/gui/string-snip-class.scrbl +++ b/collects/scribblings/gui/string-snip-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[string-snip% snip% ()]{ diff --git a/collects/scribblings/gui/style-delta-class.scrbl b/collects/scribblings/gui/style-delta-class.scrbl index 9e4d55be..b484c9a2 100644 --- a/collects/scribblings/gui/style-delta-class.scrbl +++ b/collects/scribblings/gui/style-delta-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[style-delta% object% ()]{ diff --git a/collects/scribblings/gui/style-intf.scrbl b/collects/scribblings/gui/style-intf.scrbl index f240ca16..5805035c 100644 --- a/collects/scribblings/gui/style-intf.scrbl +++ b/collects/scribblings/gui/style-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[style<%> ()]{ diff --git a/collects/scribblings/gui/style-list-class.scrbl b/collects/scribblings/gui/style-list-class.scrbl index 9a9f99c1..3c016a2f 100644 --- a/collects/scribblings/gui/style-list-class.scrbl +++ b/collects/scribblings/gui/style-list-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[style-list% object% ()]{ diff --git a/collects/scribblings/gui/subarea-intf.scrbl b/collects/scribblings/gui/subarea-intf.scrbl index 455b81ce..3f976bb0 100644 --- a/collects/scribblings/gui/subarea-intf.scrbl +++ b/collects/scribblings/gui/subarea-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[subarea<%> (area<%>)]{ diff --git a/collects/scribblings/gui/subwindow-intf.scrbl b/collects/scribblings/gui/subwindow-intf.scrbl index 47a4c558..4540f1b8 100644 --- a/collects/scribblings/gui/subwindow-intf.scrbl +++ b/collects/scribblings/gui/subwindow-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[subwindow<%> (subarea<%> window<%>)]{ diff --git a/collects/scribblings/gui/system-menu-funcs.scrbl b/collects/scribblings/gui/system-menu-funcs.scrbl index 52afb9af..b00cdc15 100644 --- a/collects/scribblings/gui/system-menu-funcs.scrbl +++ b/collects/scribblings/gui/system-menu-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title{System Menus} @@ -123,4 +123,4 @@ When the application is @italic{not} running and user double-clicks an If the current eventspace is not the initial eventspace, this procedure returns @scheme[void] (when called with zero arguments) or has no effect (when called with a handler). -} \ No newline at end of file +} diff --git a/collects/scribblings/gui/tab-panel-class.scrbl b/collects/scribblings/gui/tab-panel-class.scrbl index 39f4813a..cc41f402 100644 --- a/collects/scribblings/gui/tab-panel-class.scrbl +++ b/collects/scribblings/gui/tab-panel-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[tab-panel% vertical-panel% ()]{ diff --git a/collects/scribblings/gui/tab-snip-class.scrbl b/collects/scribblings/gui/tab-snip-class.scrbl index 44676ed6..5eafbcfd 100644 --- a/collects/scribblings/gui/tab-snip-class.scrbl +++ b/collects/scribblings/gui/tab-snip-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[tab-snip% string-snip% ()]{ diff --git a/collects/scribblings/gui/text-class.scrbl b/collects/scribblings/gui/text-class.scrbl index 64709074..e0c8ce13 100644 --- a/collects/scribblings/gui/text-class.scrbl +++ b/collects/scribblings/gui/text-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[text% object% (editor<%>)]{ diff --git a/collects/scribblings/gui/text-field-class.scrbl b/collects/scribblings/gui/text-field-class.scrbl index 628947c5..b0d1c455 100644 --- a/collects/scribblings/gui/text-field-class.scrbl +++ b/collects/scribblings/gui/text-field-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[text-field% object% (control<%>)]{ diff --git a/collects/scribblings/gui/timer-class.scrbl b/collects/scribblings/gui/timer-class.scrbl index 355f8cd2..81cdbd9d 100644 --- a/collects/scribblings/gui/timer-class.scrbl +++ b/collects/scribblings/gui/timer-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[timer% object% ()]{ diff --git a/collects/scribblings/gui/top-level-window-intf.scrbl b/collects/scribblings/gui/top-level-window-intf.scrbl index 48ae1702..490252b5 100644 --- a/collects/scribblings/gui/top-level-window-intf.scrbl +++ b/collects/scribblings/gui/top-level-window-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[top-level-window<%> (area-container-window<%>)]{ diff --git a/collects/scribblings/gui/vertical-pane-class.scrbl b/collects/scribblings/gui/vertical-pane-class.scrbl index 3ca068ca..17c0425c 100644 --- a/collects/scribblings/gui/vertical-pane-class.scrbl +++ b/collects/scribblings/gui/vertical-pane-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[vertical-pane% pane% ()]{ diff --git a/collects/scribblings/gui/vertical-panel-class.scrbl b/collects/scribblings/gui/vertical-panel-class.scrbl index eb33af08..f44de0f6 100644 --- a/collects/scribblings/gui/vertical-panel-class.scrbl +++ b/collects/scribblings/gui/vertical-panel-class.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @defclass/title[vertical-panel% panel% ()]{ diff --git a/collects/scribblings/gui/win-classes.scrbl b/collects/scribblings/gui/win-classes.scrbl index ea8e1ff5..202827d5 100644 --- a/collects/scribblings/gui/win-classes.scrbl +++ b/collects/scribblings/gui/win-classes.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @require["diagrams.ss"] diff --git a/collects/scribblings/gui/win-funcs.scrbl b/collects/scribblings/gui/win-funcs.scrbl index 01fe17b7..c1e8c78c 100644 --- a/collects/scribblings/gui/win-funcs.scrbl +++ b/collects/scribblings/gui/win-funcs.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @title{Windowing Functions} diff --git a/collects/scribblings/gui/win-overview.scrbl b/collects/scribblings/gui/win-overview.scrbl index c35e37c5..7000caab 100644 --- a/collects/scribblings/gui/win-overview.scrbl +++ b/collects/scribblings/gui/win-overview.scrbl @@ -1,5 +1,5 @@ -#reader(lib "docreader.ss" "scribble") -@require[(lib "eval.ss" "scribble")] +#lang scribble/doc +@require[scribble/eval] @require["common.ss"] @require["diagrams.ss"] diff --git a/collects/scribblings/gui/window-intf.scrbl b/collects/scribblings/gui/window-intf.scrbl index 0e5acb52..e9997a0d 100644 --- a/collects/scribblings/gui/window-intf.scrbl +++ b/collects/scribblings/gui/window-intf.scrbl @@ -1,4 +1,4 @@ -#reader(lib "docreader.ss" "scribble") +#lang scribble/doc @require["common.ss"] @definterface/title[window<%> (area<%>)]{