From c8d476c76ee1f19fc6d1bf3503081221806b709a Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 30 Apr 2011 20:34:41 -0500 Subject: [PATCH] adjust scribble's racketblock renderer so that #true and #false don't turn into #t and #f. --- collects/scribble/racket.rkt | 19 +++++++++++++------ collects/tests/scribble/docs/read-alts.scrbl | 13 +++++++++++++ collects/tests/scribble/docs/read-alts.txt | 8 ++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 collects/tests/scribble/docs/read-alts.scrbl create mode 100644 collects/tests/scribble/docs/read-alts.txt diff --git a/collects/scribble/racket.rkt b/collects/scribble/racket.rkt index 3a10f057ad..c632504244 100644 --- a/collects/scribble/racket.rkt +++ b/collects/scribble/racket.rkt @@ -209,12 +209,19 @@ (memq (syntax-e c) (current-variable-list)))] [(s it? sub?) (let ([sc (syntax-e c)]) - (let ([s (or (syntax-property c 'display-string) - (format "~s" (if (literal-syntax? sc) - (literal-syntax-stx sc) - (if (var-id? sc) - (var-id-sym sc) - sc))))]) + (let ([s (cond + [(syntax-property c 'display-string) => values] + [(literal-syntax? sc) (format "~s" (literal-syntax-stx sc))] + [(var-id? sc) (format "~s" (var-id-sym sc))] + [(eq? sc #t) + (if (equal? (syntax-span c) 5) + "#true" + "#t")] + [(eq? sc #f) + (if (equal? (syntax-span c) 6) + "#false" + "#f")] + [else (format "~s" sc)])]) (if (and (symbol? sc) ((string-length s) . > . 1) (char=? (string-ref s 0) #\_) diff --git a/collects/tests/scribble/docs/read-alts.scrbl b/collects/tests/scribble/docs/read-alts.scrbl new file mode 100644 index 0000000000..42f941d8de --- /dev/null +++ b/collects/tests/scribble/docs/read-alts.scrbl @@ -0,0 +1,13 @@ +#lang scribble/manual +@(require scribble/manual) +@; test that various alternatives in reader syntax get +@; turned into the right things when rendered +@racketblock[#t + #true + #f + #false + (a . < . b) + (< a b) + "abcdef" + ([{}])] + diff --git a/collects/tests/scribble/docs/read-alts.txt b/collects/tests/scribble/docs/read-alts.txt new file mode 100644 index 0000000000..1bf94c16d8 --- /dev/null +++ b/collects/tests/scribble/docs/read-alts.txt @@ -0,0 +1,8 @@ + #t + #true + #f + #false + (a . < . b) + (< a b) + "abcdef" + ([{}])