diff --git a/collects/scribble/base.rkt b/collects/scribble/base.rkt index a563cf99..94e88abe 100644 --- a/collects/scribble/base.rkt +++ b/collects/scribble/base.rkt @@ -7,9 +7,8 @@ "html-properties.rkt" scheme/list scheme/class - scheme/contract + racket/contract/base setup/main-collects - syntax/modresolve (for-syntax scheme/base)) ;; ---------------------------------------- diff --git a/collects/scribble/base/lang.rkt b/collects/scribble/base/lang.rkt index 173f2c1e..a9642769 100644 --- a/collects/scribble/base/lang.rkt +++ b/collects/scribble/base/lang.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket/base (require scribble/doclang scribble/base) (provide (all-from-out scribble/doclang scribble/base)) diff --git a/collects/scribble/bnf.rkt b/collects/scribble/bnf.rkt index 597dead1..d3575ae2 100644 --- a/collects/scribble/bnf.rkt +++ b/collects/scribble/bnf.rkt @@ -1,8 +1,7 @@ (module bnf mzscheme (require "struct.rkt" "decode.rkt" - mzlib/kw - mzlib/class) + mzlib/kw) (provide BNF nonterm diff --git a/collects/scribble/core.rkt b/collects/scribble/core.rkt index aa884601..51303511 100644 --- a/collects/scribble/core.rkt +++ b/collects/scribble/core.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require "private/provide-structs.rkt" scheme/serialize - scheme/contract + racket/contract/base file/convertible) ;; ---------------------------------------- diff --git a/collects/scribble/decode-struct.rkt b/collects/scribble/decode-struct.rkt index 2583e4cb..3a56e267 100644 --- a/collects/scribble/decode-struct.rkt +++ b/collects/scribble/decode-struct.rkt @@ -1,7 +1,5 @@ #lang scheme/base - -(require "core.rkt" - "private/provide-structs.rkt") +(require "private/provide-structs.rkt") (provide-structs [part-index-desc ()]) diff --git a/collects/scribble/decode.rkt b/collects/scribble/decode.rkt index 2f5f51de..c6d8beff 100644 --- a/collects/scribble/decode.rkt +++ b/collects/scribble/decode.rkt @@ -2,8 +2,7 @@ (require "core.rkt" "private/provide-structs.rkt" "decode-struct.rkt" - scheme/contract - scheme/class + racket/contract/base scheme/list) (define (pre-content? i) diff --git a/collects/scribble/doclang.rkt b/collects/scribble/doclang.rkt index 1acbea93..f0590eee 100644 --- a/collects/scribble/doclang.rkt +++ b/collects/scribble/doclang.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require "struct.rkt" - "decode.rkt" +(require "decode.rkt" (for-syntax racket/base syntax/kerncase)) diff --git a/collects/scribble/eval.rkt b/collects/scribble/eval.rkt index 7563af1d..2b944f7a 100644 --- a/collects/scribble/eval.rkt +++ b/collects/scribble/eval.rkt @@ -1,8 +1,9 @@ #lang racket/base (require "manual.rkt" "struct.rkt" "scheme.rkt" "decode.rkt" - racket/string racket/list racket/file - racket/sandbox racket/promise racket/port file/convertible + racket/list + file/convertible ;; attached into new namespace via anchor + racket/sandbox racket/promise racket/port racket/gui/dynamic (for-syntax racket/base)) diff --git a/collects/scribble/html-properties.rkt b/collects/scribble/html-properties.rkt index a46b9785..9d46cabc 100644 --- a/collects/scribble/html-properties.rkt +++ b/collects/scribble/html-properties.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [body-id ([value string?])] diff --git a/collects/scribble/html/resource.rkt b/collects/scribble/html/resource.rkt index 54632f4e..1cd83ec7 100644 --- a/collects/scribble/html/resource.rkt +++ b/collects/scribble/html/resource.rkt @@ -26,7 +26,7 @@ ;; rendering; they will also be rendered in turn until no more resources are ;; created. -(require racket/list racket/string scribble/text "xml.rkt") +(require scribble/text) ;; default file, urls to it will point to its directory instead, and a ;; /-suffixed path will render to this file diff --git a/collects/scribble/jfp/lang.rkt b/collects/scribble/jfp/lang.rkt index 3ee36659..429ece6d 100644 --- a/collects/scribble/jfp/lang.rkt +++ b/collects/scribble/jfp/lang.rkt @@ -1,8 +1,6 @@ #lang scheme/base (require scribble/doclang - scribble/core (except-in scribble/base author) - scribble/decode scribble/jfp setup/main-collects "../private/defaults.rkt" diff --git a/collects/scribble/latex-properties.rkt b/collects/scribble/latex-properties.rkt index f0386092..7e6396aa 100644 --- a/collects/scribble/latex-properties.rkt +++ b/collects/scribble/latex-properties.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [tex-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)))])] diff --git a/collects/scribble/latex-render.rkt b/collects/scribble/latex-render.rkt index ba574c16..1657907d 100644 --- a/collects/scribble/latex-render.rkt +++ b/collects/scribble/latex-render.rkt @@ -1,12 +1,10 @@ #lang scheme/base - (require "core.rkt" "latex-properties.rkt" "private/render-utils.rkt" scheme/class scheme/runtime-path scheme/port - scheme/path scheme/string scheme/list setup/main-collects diff --git a/collects/scribble/lncs/lang.rkt b/collects/scribble/lncs/lang.rkt index bfde172f..9051d355 100644 --- a/collects/scribble/lncs/lang.rkt +++ b/collects/scribble/lncs/lang.rkt @@ -6,16 +6,15 @@ (prefix-in s/b: scribble/base) scribble/decode "../private/defaults.rkt" - (for-syntax racket/base racket/list) setup/main-collects scribble/html-properties scribble/latex-properties racket/stxparam net/ftp file/gunzip - (for-syntax racket/stxparam-exptime - racket/base - setup/dirs)) + (for-syntax racket/base + racket/list + racket/stxparam-exptime)) (provide (except-out (all-from-out scribble/doclang) #%module-begin) (all-from-out scribble/base) diff --git a/collects/scribble/lp.rkt b/collects/scribble/lp.rkt index eebf6cd5..b96a8a0b 100644 --- a/collects/scribble/lp.rkt +++ b/collects/scribble/lp.rkt @@ -1,4 +1,3 @@ -#lang scheme - +#lang racket/base (require scribble/private/lp) (provide chunk) diff --git a/collects/scribble/lp/lang/lang.rkt b/collects/scribble/lp/lang/lang.rkt index 640849a0..9a65f368 100644 --- a/collects/scribble/lp/lang/lang.rkt +++ b/collects/scribble/lp/lang/lang.rkt @@ -3,7 +3,7 @@ (provide (except-out (all-from-out scheme/base) #%module-begin) (rename-out [module-begin #%module-begin])) -(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/kerncase +(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/strip-context)) ;; --- MF: bad hack for getting rid of comments diff --git a/collects/scribble/manual-struct.rkt b/collects/scribble/manual-struct.rkt index 44963912..0e229abd 100644 --- a/collects/scribble/manual-struct.rkt +++ b/collects/scribble/manual-struct.rkt @@ -1,8 +1,7 @@ #lang scheme/base - (require "core.rkt" "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [module-path-index-desc ()] diff --git a/collects/scribble/private/indirect-renderer.rkt b/collects/scribble/private/indirect-renderer.rkt index dc6f9511..68371ecf 100644 --- a/collects/scribble/private/indirect-renderer.rkt +++ b/collects/scribble/private/indirect-renderer.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/class racket/file racket/path racket/port) +(require racket/class racket/file racket/path) (provide make-indirect-renderer-mixin) diff --git a/collects/scribble/private/lp.rkt b/collects/scribble/private/lp.rkt index a565a293..28efb5bb 100644 --- a/collects/scribble/private/lp.rkt +++ b/collects/scribble/private/lp.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/kerncase) +(require (for-syntax scheme/base syntax/boundmap) scribble/scheme scribble/decode scribble/manual scribble/struct) (begin-for-syntax diff --git a/collects/scribble/private/manual-bib.rkt b/collects/scribble/private/manual-bib.rkt index afc155ce..08b25741 100644 --- a/collects/scribble/private/manual-bib.rkt +++ b/collects/scribble/private/manual-bib.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require scheme/contract +(require racket/contract/base "../decode.rkt" "../struct.rkt" "../basic.rkt" diff --git a/collects/scribble/private/manual-bind.rkt b/collects/scribble/private/manual-bind.rkt index 7acf507c..d5c4c839 100644 --- a/collects/scribble/private/manual-bind.rkt +++ b/collects/scribble/private/manual-bind.rkt @@ -1,25 +1,15 @@ #lang scheme/base -(require "../decode.rkt" - "../struct.rkt" +(require "../struct.rkt" "../scheme.rkt" "../search.rkt" "../basic.rkt" "../manual-struct.rkt" "manual-ex.rkt" - scheme/string - scheme/contract - scheme/list - scheme/class - scheme/stxparam - scheme/serialize - setup/main-collects - (for-syntax scheme/base - syntax/boundmap - syntax/kerncase) + racket/contract/base + (for-syntax scheme/base) (for-label scheme/base scheme/class)) - (provide definition-site libs->taglet annote-exporting-library diff --git a/collects/scribble/private/manual-class.rkt b/collects/scribble/private/manual-class.rkt index 7c55292a..54b5f1b2 100644 --- a/collects/scribble/private/manual-class.rkt +++ b/collects/scribble/private/manual-class.rkt @@ -9,14 +9,11 @@ scheme/serialize scheme/stxparam "manual-utils.rkt" - "manual-vars.rkt" "manual-style.rkt" "manual-scheme.rkt" "manual-bind.rkt" "manual-method.rkt" "manual-proc.rkt" - "manual-ex.rkt" - scheme/string scheme/list (for-syntax scheme/base) (for-label scheme/base diff --git a/collects/scribble/private/manual-code.rkt b/collects/scribble/private/manual-code.rkt index f90e7507..362e1985 100644 --- a/collects/scribble/private/manual-code.rkt +++ b/collects/scribble/private/manual-code.rkt @@ -2,7 +2,6 @@ (require syntax/strip-context syntax-color/module-lexer "../racket.rkt" - "../core.rkt" "../base.rkt" "manual-scheme.rkt" "manual-style.rkt" diff --git a/collects/scribble/private/manual-form.rkt b/collects/scribble/private/manual-form.rkt index 2a30f171..76b8f922 100644 --- a/collects/scribble/private/manual-form.rkt +++ b/collects/scribble/private/manual-form.rkt @@ -2,23 +2,17 @@ (require "../decode.rkt" "../struct.rkt" "../scheme.rkt" - "../search.rkt" "../basic.rkt" "../manual-struct.rkt" "qsloc.rkt" "manual-utils.rkt" "manual-vars.rkt" - "manual-style.rkt" "manual-scheme.rkt" "manual-bind.rkt" - "manual-method.rkt" - "manual-ex.rkt" - scheme/string scheme/list (for-syntax scheme/base) (for-label scheme/base)) - (provide defform defform* defform/subs defform*/subs defform/none defidform defidform/inline specform specform/subs diff --git a/collects/scribble/private/manual-mod.rkt b/collects/scribble/private/manual-mod.rkt index 6cd96aec..10c7df11 100644 --- a/collects/scribble/private/manual-mod.rkt +++ b/collects/scribble/private/manual-mod.rkt @@ -6,8 +6,6 @@ "manual-ex.rkt" "manual-style.rkt" "manual-scheme.rkt" - scheme/string - scheme/list (for-syntax scheme/base) (for-label scheme/base)) diff --git a/collects/scribble/private/manual-proc.rkt b/collects/scribble/private/manual-proc.rkt index c7b9eaca..191cbcb4 100644 --- a/collects/scribble/private/manual-proc.rkt +++ b/collects/scribble/private/manual-proc.rkt @@ -1,8 +1,6 @@ #lang racket/base -(require "../decode.rkt" - "../struct.rkt" +(require "../struct.rkt" "../scheme.rkt" - "../search.rkt" "../basic.rkt" "../manual-struct.rkt" (only-in "../core.rkt" diff --git a/collects/scribble/private/manual-scheme.rkt b/collects/scribble/private/manual-scheme.rkt index 307938cc..113d6a1e 100644 --- a/collects/scribble/private/manual-scheme.rkt +++ b/collects/scribble/private/manual-scheme.rkt @@ -4,10 +4,8 @@ "../scheme.rkt" "../search.rkt" "../basic.rkt" - (only-in "../core.rkt" make-style box-mode) - racket/list - "manual-utils.rkt" "manual-style.rkt" + "manual-utils.rkt" ;; used via datum->syntax (for-syntax racket/base) (for-label racket/base)) diff --git a/collects/scribble/private/manual-sprop.rkt b/collects/scribble/private/manual-sprop.rkt index 88778707..35c206fe 100644 --- a/collects/scribble/private/manual-sprop.rkt +++ b/collects/scribble/private/manual-sprop.rkt @@ -1,10 +1,8 @@ #lang scheme/base - (require "../html-properties.rkt" "../latex-properties.rkt" "on-demand.rkt" - setup/main-collects - scheme/promise) + setup/main-collects) (provide scheme-properties) diff --git a/collects/scribble/private/manual-style.rkt b/collects/scribble/private/manual-style.rkt index 39b96860..61ad3bb5 100644 --- a/collects/scribble/private/manual-style.rkt +++ b/collects/scribble/private/manual-style.rkt @@ -11,7 +11,7 @@ "on-demand.rkt" "manual-sprop.rkt" racket/list - racket/contract + racket/contract/base racket/string) (provide (rename-out [hyperlink link]) diff --git a/collects/scribble/private/manual-tech.rkt b/collects/scribble/private/manual-tech.rkt index 5f32d4d9..1a508b75 100644 --- a/collects/scribble/private/manual-tech.rkt +++ b/collects/scribble/private/manual-tech.rkt @@ -1,8 +1,7 @@ #lang scheme/base -(require scheme/contract +(require racket/contract/base "../decode.rkt" "../struct.rkt" - "../basic.rkt" "manual-utils.rkt" "manual-style.rkt") diff --git a/collects/scribble/private/manual-unit.rkt b/collects/scribble/private/manual-unit.rkt index 6fe9ecdf..a336e62e 100644 --- a/collects/scribble/private/manual-unit.rkt +++ b/collects/scribble/private/manual-unit.rkt @@ -1,17 +1,11 @@ #lang scheme/base (require "../decode.rkt" "../struct.rkt" - "../scheme.rkt" - "../search.rkt" - "../basic.rkt" - "manual-utils.rkt" "manual-vars.rkt" - "manual-style.rkt" - "manual-scheme.rkt" "manual-bind.rkt" "manual-ex.rkt" "manual-proc.rkt" - scheme/contract + racket/contract/base (for-syntax scheme/base) (for-label scheme/base)) diff --git a/collects/scribble/private/manual-utils.rkt b/collects/scribble/private/manual-utils.rkt index 6ed36a5a..4a07d68e 100644 --- a/collects/scribble/private/manual-utils.rkt +++ b/collects/scribble/private/manual-utils.rkt @@ -1,10 +1,9 @@ #lang scheme/base (require "../struct.rkt" - "../decode.rkt" "../base.rkt" (only-in "../core.rkt" content?) - scheme/contract + racket/contract/base scheme/list) (provide doc-prefix) diff --git a/collects/scribble/private/manual-vars.rkt b/collects/scribble/private/manual-vars.rkt index e6c02759..c287f7d5 100644 --- a/collects/scribble/private/manual-vars.rkt +++ b/collects/scribble/private/manual-vars.rkt @@ -6,7 +6,7 @@ make-style style-name nested-flow? nested-flow-blocks nested-flow-style) "../html-properties.rkt" - scheme/contract + racket/contract/base (for-syntax scheme/base syntax/kerncase syntax/boundmap) diff --git a/collects/scribble/private/on-demand.rkt b/collects/scribble/private/on-demand.rkt index 6a97468d..11b78b16 100644 --- a/collects/scribble/private/on-demand.rkt +++ b/collects/scribble/private/on-demand.rkt @@ -1,4 +1,6 @@ -#lang scheme +#lang racket/base +(require racket/promise + (for-syntax racket/base)) (provide define-on-demand) (define-syntax-rule (define-on-demand id rhs) diff --git a/collects/scribble/private/provide-structs.rkt b/collects/scribble/private/provide-structs.rkt index 18162c2e..66aa3b4e 100644 --- a/collects/scribble/private/provide-structs.rkt +++ b/collects/scribble/private/provide-structs.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/serialize - scheme/contract + racket/contract/base (for-syntax scheme/base)) (provide provide-structs) diff --git a/collects/scribble/private/run-pdflatex.rkt b/collects/scribble/private/run-pdflatex.rkt index 7efec3a3..49638b85 100644 --- a/collects/scribble/private/run-pdflatex.rkt +++ b/collects/scribble/private/run-pdflatex.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require scheme/system scheme/port scheme/promise) +(require scheme/system scheme/port) (provide run-pdflatex) diff --git a/collects/scribble/racket.rkt b/collects/scribble/racket.rkt index 321eb718..e408e88b 100644 --- a/collects/scribble/racket.rkt +++ b/collects/scribble/racket.rkt @@ -4,10 +4,6 @@ "search.rkt" "private/manual-sprop.rkt" "private/on-demand.rkt" - mzlib/class - mzlib/for - syntax/modresolve - syntax/modcode file/convertible (for-syntax racket/base)) diff --git a/collects/scribble/render.rkt b/collects/scribble/render.rkt index f9ee4a72..14310102 100644 --- a/collects/scribble/render.rkt +++ b/collects/scribble/render.rkt @@ -5,7 +5,7 @@ "xref.rkt" racket/file racket/class - racket/contract + racket/contract/base (prefix-in html: "html-render.rkt")) (provide/contract diff --git a/collects/scribble/search.rkt b/collects/scribble/search.rkt index 2db52b6c..38695def 100644 --- a/collects/scribble/search.rkt +++ b/collects/scribble/search.rkt @@ -1,7 +1,6 @@ (module search racket/base (require "struct.rkt" "basic.rkt" - setup/main-collects syntax/modcode) (provide find-racket-tag diff --git a/collects/scribble/sigplan.rkt b/collects/scribble/sigplan.rkt index 8607a800..0a6e8f68 100644 --- a/collects/scribble/sigplan.rkt +++ b/collects/scribble/sigplan.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require setup/main-collects - scheme/contract + racket/contract/base scribble/core scribble/base scribble/decode diff --git a/collects/scribble/sigplan/lang.rkt b/collects/scribble/sigplan/lang.rkt index 2f01623a..49b3dae9 100644 --- a/collects/scribble/sigplan/lang.rkt +++ b/collects/scribble/sigplan/lang.rkt @@ -2,7 +2,6 @@ (require scribble/doclang scribble/core scribble/base - scribble/decode scribble/sigplan racket/list "../private/defaults.rkt" diff --git a/collects/scribble/srcdoc.rkt b/collects/scribble/srcdoc.rkt index 2553b2f2..e1253e78 100644 --- a/collects/scribble/srcdoc.rkt +++ b/collects/scribble/srcdoc.rkt @@ -1,6 +1,5 @@ #lang scheme/base - -(require scheme/contract +(require racket/contract/base (for-syntax scheme/base) "provide-doc-transform.rkt") diff --git a/collects/scribble/struct.rkt b/collects/scribble/struct.rkt index f3ff18f6..c9fa8cb6 100644 --- a/collects/scribble/struct.rkt +++ b/collects/scribble/struct.rkt @@ -7,7 +7,7 @@ "html-properties.rkt" scheme/provide-syntax scheme/struct-info - scheme/contract + racket/contract/base (for-syntax scheme/base)) (define-provide-syntax (compat**-out stx) diff --git a/collects/scribble/xref.rkt b/collects/scribble/xref.rkt index bb5918a0..19407860 100644 --- a/collects/scribble/xref.rkt +++ b/collects/scribble/xref.rkt @@ -1,15 +1,11 @@ #lang scheme/base (require scribble/struct - scribble/manual-struct - scribble/decode-struct scribble/base-render scribble/search (prefix-in html: scribble/html-render) scheme/class - mzlib/serialize - scheme/path - setup/main-collects) + scheme/path) (provide load-xref xref?