diff --git a/collects/scribblings/guide/class.scrbl b/collects/scribblings/guide/class.scrbl index 0e76748970..affb981a83 100644 --- a/collects/scribblings/guide/class.scrbl +++ b/collects/scribblings/guide/class.scrbl @@ -54,7 +54,7 @@ public methods @scheme[get-size], @scheme[grow], and @scheme[eat]: (grow (send other-fish get-size)))) ] -@interaction-eval[ +@(interaction-eval #:eval class-eval (define fish% (class object% @@ -66,7 +66,7 @@ public methods @scheme[get-size], @scheme[grow], and @scheme[eat]: (define/public (grow amt) (set! current-size (+ amt current-size))) (define/public (eat other-fish) - (grow (send other-fish get-size)))))] + (grow (send other-fish get-size)))))) The @scheme[size] initialization argument must be supplied via a named argument when instantiating the class through the @scheme[new] form: @@ -82,9 +82,9 @@ Of course, we can also name the class and its instance: (define charlie (new fish% [size 10])) ] -@interaction-eval[ +@(interaction-eval #:eval class-eval -(define charlie (new fish% [size 10]))] +(define charlie (new fish% [size 10]))) In the definition of @scheme[fish%], @scheme[current-size] is a private field that starts out with the value of the @scheme[size] diff --git a/collects/scribblings/guide/io.scrbl b/collects/scribblings/guide/io.scrbl index 50155f011f..5257b9da93 100644 --- a/collects/scribblings/guide/io.scrbl +++ b/collects/scribblings/guide/io.scrbl @@ -14,7 +14,7 @@ (list (list (make-flow (list a)) (make-flow (list (make-paragraph (list (hspace 1))))) (make-flow (list b)))))) -@interaction-eval[#:eval io-eval (print-hash-table #t)] +@(interaction-eval #:eval io-eval (print-hash-table #t)) @title[#:tag "i/o" #:style 'toc]{Input and Output} @@ -39,9 +39,9 @@ examples: file for writing, and @scheme[open-input-file] opens a file for reading. -@interaction-eval[#:eval io-eval (define old-dir (current-directory))] -@interaction-eval[#:eval io-eval (current-directory (find-system-path 'temp-dir))] -@interaction-eval[#:eval io-eval (when (file-exists? "data") (delete-file "data"))] +@(interaction-eval #:eval io-eval (define old-dir (current-directory))) +@(interaction-eval #:eval io-eval (current-directory (find-system-path 'temp-dir))) +@(interaction-eval #:eval io-eval (when (file-exists? "data") (delete-file "data"))) @examples[ #:eval io-eval @@ -81,8 +81,8 @@ with the output port; when the function returns, the port is closed. (read-line in))) ] -@interaction-eval[#:eval io-eval (when (file-exists? "data") (delete-file "data"))] -@interaction-eval[#:eval io-eval (current-directory old-dir)]} +@(interaction-eval #:eval io-eval (when (file-exists? "data") (delete-file "data"))) +@(interaction-eval #:eval io-eval (current-directory old-dir))} @;- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @item{@bold{Strings:} The @scheme[open-output-string] function creates diff --git a/collects/scribblings/guide/lists.scrbl b/collects/scribblings/guide/lists.scrbl index a5129ee6a3..637b0147e7 100644 --- a/collects/scribblings/guide/lists.scrbl +++ b/collects/scribblings/guide/lists.scrbl @@ -9,7 +9,7 @@ @(define step @elem{=}) @(define list-eval (make-base-eval)) -@interaction-eval[#:eval list-eval (require scheme/list)] +@(interaction-eval #:eval list-eval (require scheme/list)) @title{Lists, Iteration, and Recursion} diff --git a/collects/scribblings/guide/set.scrbl b/collects/scribblings/guide/set.scrbl index b1a0646a41..75c9314052 100644 --- a/collects/scribblings/guide/set.scrbl +++ b/collects/scribblings/guide/set.scrbl @@ -3,7 +3,7 @@ scribble/eval "guide-utils.ss") -@interaction-eval[(require (lib "mzlib/for.ss"))] +@(interaction-eval (require (lib "mzlib/for.ss"))) @title[#:tag "set!"]{Assignment: @scheme[set!]} diff --git a/collects/scribblings/guide/truth.scrbl b/collects/scribblings/guide/truth.scrbl index 99ce1573fc..244603c69c 100644 --- a/collects/scribblings/guide/truth.scrbl +++ b/collects/scribblings/guide/truth.scrbl @@ -7,7 +7,7 @@ (for-label scheme/list)) @(define list-eval (make-base-eval)) -@interaction-eval[#:eval list-eval (require scheme/list)] +@(interaction-eval #:eval list-eval (require scheme/list)) @title{Pairs, Lists, and Scheme Syntax} diff --git a/collects/scribblings/more/more.scrbl b/collects/scribblings/more/more.scrbl index 0541ced70d..e671913342 100644 --- a/collects/scribblings/more/more.scrbl +++ b/collects/scribblings/more/more.scrbl @@ -13,20 +13,20 @@ @(define guide @other-manual['(lib "guide.scrbl" "scribblings/guide")]) @(define more-eval (make-base-eval)) -@interaction-eval[#:eval more-eval - (define (show-load re?) - (fprintf (current-error-port) " [~aloading serve.ss]\n" (if re? "re-" "")))] -@interaction-eval[#:eval more-eval - (define (serve n) void)] -@interaction-eval[#:eval more-eval - (define (show-break) - (fprintf (current-error-port) "^Cuser break"))] -@interaction-eval[#:eval more-eval - (define (show-fail n) - (error 'tcp-listen - "listen on ~a failed (address already in use)" - n))] -@interaction-eval[#:eval more-eval (require xml net/url)] +@(interaction-eval #:eval more-eval + (define (show-load re?) + (fprintf (current-error-port) " [~aloading serve.ss]\n" (if re? "re-" "")))) +@(interaction-eval #:eval more-eval + (define (serve n) void)) +@(interaction-eval #:eval more-eval + (define (show-break) + (fprintf (current-error-port) "^Cuser break"))) +@(interaction-eval #:eval more-eval + (define (show-fail n) + (error 'tcp-listen + "listen on ~a failed (address already in use)" + n))) +@(interaction-eval #:eval more-eval (require xml net/url)) @(define (whole-prog which [last? #f]) (let ([file (format "step~a.txt" which)]) diff --git a/collects/scribblings/quick/quick.scrbl b/collects/scribblings/quick/quick.scrbl index 5394e7455f..c8de6764db 100644 --- a/collects/scribblings/quick/quick.scrbl +++ b/collects/scribblings/quick/quick.scrbl @@ -524,7 +524,7 @@ classes. By convention, the classes are given names that end with (send f show #t) ] -@mr-interaction-eval[(send f show #f)] +@(mr-interaction-eval (send f show #f)) The @scheme[new] form creates an instance of a class, where initialization arguments like @scheme[label] and @scheme[width] are @@ -552,12 +552,12 @@ picture into a canvas: ] @centerline{ -@mr-interaction-eval-show[(scale - (bitmap - (build-path - (collection-path "scribblings/quick") - "art.png")) - 0.5)]} +@(mr-interaction-eval-show (scale + (bitmap + (build-path + (collection-path "scribblings/quick") + "art.png")) + 0.5))} Each canvas stretches to fill an equal portion of the frame, because that's how a frame manages its children by default. diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl index 15dea2ea79..ac5026a985 100644 --- a/collects/scribblings/reference/class.scrbl +++ b/collects/scribblings/reference/class.scrbl @@ -70,7 +70,7 @@ ) -@interaction-eval[#:eval class-eval (require scheme/class)] +@(interaction-eval #:eval class-eval (require scheme/class)) @title[#:tag "mzlib:class" #:style 'toc]{Classes and Objects} diff --git a/collects/scribblings/reference/define-struct.scrbl b/collects/scribblings/reference/define-struct.scrbl index 02f5121a1a..b9402673dd 100644 --- a/collects/scribblings/reference/define-struct.scrbl +++ b/collects/scribblings/reference/define-struct.scrbl @@ -4,7 +4,7 @@ (for-label scheme/serialize)) @(define posn-eval (make-base-eval)) -@interaction-eval[#:eval posn-eval (require (for-syntax scheme/base))] +@(interaction-eval #:eval posn-eval (require (for-syntax scheme/base))) @title[#:tag "define-struct"]{Defining Structure Types: @scheme[define-struct]} diff --git a/collects/scribblings/reference/dicts.scrbl b/collects/scribblings/reference/dicts.scrbl index 7681858a4c..c44764164e 100644 --- a/collects/scribblings/reference/dicts.scrbl +++ b/collects/scribblings/reference/dicts.scrbl @@ -3,7 +3,7 @@ scribble/eval) @(define dict-eval (make-base-eval)) -@interaction-eval[#:eval dict-eval (require scheme/dict)] +@(interaction-eval #:eval dict-eval (require scheme/dict)) @title[#:tag "dicts"]{Dictionaries} diff --git a/collects/scribblings/reference/match.scrbl b/collects/scribblings/reference/match.scrbl index 15fa0d92b5..8c813ff355 100644 --- a/collects/scribblings/reference/match.scrbl +++ b/collects/scribblings/reference/match.scrbl @@ -4,7 +4,7 @@ scheme/match) @(define match-eval (make-base-eval)) -@interaction-eval[#:eval match-eval (require scheme/match)] +@(interaction-eval #:eval match-eval (require scheme/match)) @title[#:tag "match"]{Pattern Matching} diff --git a/collects/scribblings/reference/numbers.scrbl b/collects/scribblings/reference/numbers.scrbl index 9991c872cf..9907d1a13c 100644 --- a/collects/scribblings/reference/numbers.scrbl +++ b/collects/scribblings/reference/numbers.scrbl @@ -3,7 +3,7 @@ scheme/math) @(define math-eval (make-base-eval)) -@interaction-eval[#:eval math-eval (require scheme/math)] +@(interaction-eval #:eval math-eval (require scheme/math)) @title[#:tag "numbers"]{Numbers} diff --git a/collects/scribblings/reference/procedures.scrbl b/collects/scribblings/reference/procedures.scrbl index f0e1a9449c..7c520a2bc1 100644 --- a/collects/scribblings/reference/procedures.scrbl +++ b/collects/scribblings/reference/procedures.scrbl @@ -404,7 +404,7 @@ applied.} @note-lib[scheme/function] @(define fun-eval (make-base-eval)) -@interaction-eval[#:eval fun-eval (require scheme/function)] +@(interaction-eval #:eval fun-eval (require scheme/function)) @defproc[(negate [proc procedure?]) procedure?]{ diff --git a/collects/scribblings/reference/sandbox.scrbl b/collects/scribblings/reference/sandbox.scrbl index a2433de540..5186f0d928 100644 --- a/collects/scribblings/reference/sandbox.scrbl +++ b/collects/scribblings/reference/sandbox.scrbl @@ -6,7 +6,7 @@ scheme/gui/dynamic)) @(define box-eval (make-base-eval)) -@interaction-eval[#:eval box-eval (require scheme/sandbox)] +@(interaction-eval #:eval box-eval (require scheme/sandbox)) @title{Sandboxed Evaluation} diff --git a/collects/scribblings/reference/serialization.scrbl b/collects/scribblings/reference/serialization.scrbl index c477db4676..a0b18dced8 100644 --- a/collects/scribblings/reference/serialization.scrbl +++ b/collects/scribblings/reference/serialization.scrbl @@ -4,7 +4,7 @@ (for-label scheme/serialize)) @(define ser-eval (make-base-eval)) -@interaction-eval[#:eval ser-eval (require scheme/serialize)] +@(interaction-eval #:eval ser-eval (require scheme/serialize)) @title[#:tag "serialization"]{Serialization} diff --git a/collects/scribblings/reference/shared.scrbl b/collects/scribblings/reference/shared.scrbl index 67cfab2eb1..62d7915314 100644 --- a/collects/scribblings/reference/shared.scrbl +++ b/collects/scribblings/reference/shared.scrbl @@ -6,7 +6,7 @@ @(define shared-eval (make-base-eval)) -@interaction-eval[#:eval shared-eval (require scheme/shared)] +@(interaction-eval #:eval shared-eval (require scheme/shared)) @(define maker (make-element #f (list diff --git a/collects/scribblings/reference/strings.scrbl b/collects/scribblings/reference/strings.scrbl index 717adfb247..6949c9e748 100644 --- a/collects/scribblings/reference/strings.scrbl +++ b/collects/scribblings/reference/strings.scrbl @@ -367,7 +367,7 @@ allocated string).} @note-lib[scheme/string] @(define string-eval (make-base-eval)) -@interaction-eval[#:eval string-eval (require scheme/string scheme/list)] +@(interaction-eval #:eval string-eval (require scheme/string scheme/list)) @defproc[(string-append* [str string?] ... [strs (listof string?)]) string?]{ @; Note: this is exactly the same description as the one for append* diff --git a/collects/scribblings/reference/stx-trans.scrbl b/collects/scribblings/reference/stx-trans.scrbl index d8828ffb44..07d636776d 100644 --- a/collects/scribblings/reference/stx-trans.scrbl +++ b/collects/scribblings/reference/stx-trans.scrbl @@ -7,7 +7,7 @@ scheme/provide-syntax)) @(define stx-eval (make-base-eval)) -@interaction-eval[#:eval stx-eval (require (for-syntax scheme/base))] +@(interaction-eval #:eval stx-eval (require (for-syntax scheme/base))) @(define (transform-time) @t{This procedure must be called during the dynamic extent of a @tech{syntax transformer} application by the diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl index 4fffb4f43c..0048aea487 100644 --- a/collects/scribblings/scribble/reader.scrbl +++ b/collects/scribblings/scribble/reader.scrbl @@ -8,7 +8,7 @@ use-at-readtable))) @(define read-eval (make-base-eval)) -@interaction-eval[#:eval read-eval (require (for-syntax scheme/base))] +@(interaction-eval #:eval read-eval (require (for-syntax scheme/base))) @title[#:tag "reader"]{@"@"-Reader}