From 44947880177d903e333f1da3d9cdf4c7a2342eb8 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 13 Feb 2013 07:24:50 -0600 Subject: [PATCH] fix rendering of example in Guide closes PR 13517 --- collects/scribble/private/manual-style.rkt | 8 +++++--- collects/scribblings/guide/truth.scrbl | 8 ++++---- collects/scribblings/scribble/manual.scrbl | 7 +++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/collects/scribble/private/manual-style.rkt b/collects/scribble/private/manual-style.rkt index 420a869613..63b48f4020 100644 --- a/collects/scribble/private/manual-style.rkt +++ b/collects/scribble/private/manual-style.rkt @@ -29,11 +29,13 @@ (define-syntax-rule (provide-styling id ...) (provide/contract [id styling-f/c] ...)) (provide-styling racketmodfont racketoutput - racketerror racketfont racketvalfont racketresultfont racketidfont racketvarfont + racketerror racketfont racketvalfont racketidfont racketvarfont racketcommentfont racketparenfont racketkeywordfont racketmetafont onscreen defterm filepath exec envvar Flag DFlag PFlag DPFlag math procedure indexed-file indexed-envvar idefterm pidefterm) +(provide + (contract-out [racketresultfont (->* () (#:decode? boolean?) #:rest (listof pre-content?) element?)])) (define-syntax-rule (provide-scheme-styling [rid sid] ...) (provide/contract [rename rid sid styling-f/c] ...)) (provide-scheme-styling [racketmodfont schememodfont] @@ -91,8 +93,8 @@ (apply tt str)) (define (racketvalfont . str) (make-element value-color (decode-content str))) -(define (racketresultfont . str) - (make-element result-color (decode-content str))) +(define (racketresultfont #:decode? [decode? #t] . str) + (make-element result-color (if decode? (decode-content str) str))) (define (racketidfont . str) (make-element symbol-color (decode-content str))) (define (racketvarfont . str) diff --git a/collects/scribblings/guide/truth.scrbl b/collects/scribblings/guide/truth.scrbl index 8b2f3fa1f3..e81e2b39c0 100644 --- a/collects/scribblings/guide/truth.scrbl +++ b/collects/scribblings/guide/truth.scrbl @@ -64,11 +64,11 @@ a pair, but @italic{is not} a list: @interaction[(cons 0 (cons 1 2))] In general, the rule for printing a pair is as follows: use the dot -notation always, but if the dot is immediately followed by an open -parenthesis, then remove the dot, the open parenthesis, and the -matching close parenthesis. Thus, @racketresultfont{'(0 . (1 . 2))} +notation unless the dot is immediately followed by an open +parenthesis. In that case, remove the dot, the open parenthesis, and the +matching close parenthesis. Thus, @racketresultfont[#:decode? #f]{'(0 . (1 . 2))} becomes @racketresult['(0 1 . 2)], and -@racketresultfont{'(1 . (2 . (3 . ())))} becomes @racketresult['(1 2 3)]. +@racketresultfont[#:decode? #f]{'(1 . (2 . (3 . ())))} becomes @racketresult['(1 2 3)]. @;------------------------------------------------------------------------ @section[#:tag "quoting-lists"]{Quoting Pairs and Symbols with @racket[quote]} diff --git a/collects/scribblings/scribble/manual.scrbl b/collects/scribblings/scribble/manual.scrbl index 8979e75e84..63026fa1d7 100644 --- a/collects/scribblings/scribble/manual.scrbl +++ b/collects/scribblings/scribble/manual.scrbl @@ -446,8 +446,11 @@ Racket. This procedure is useful for typesetting things like @defproc[(racketvalfont [pre-content pre-content?] ...) element?]{Like @racket[racketfont], but colored as a value.} -@defproc[(racketresultfont [pre-content pre-content?] ...) element?]{Like -@racket[racketfont], but colored as a REPL result.} +@defproc[(racketresultfont [#:decode? decode? boolean? #t] [pre-content pre-content?] ...) element?]{ + Like @racket[racketfont], but colored as a REPL result when @racket[decode?] is + @racket[#t]. When @racket[decode?] is @racket[#f], it also avoids @racket[decode]ing + its argument. +} @defproc[(racketidfont [pre-content pre-content?] ...) element?]{Like @racket[racketfont], but colored as an identifier.}