change the font in the pink highlighting to avoid some

bad drawing behavior on the mac (that shows up in the
amb tutorial)
This commit is contained in:
Robby Findler 2012-02-08 15:45:54 -06:00
parent dc8f47b20a
commit b3a9ae9ba2

View File

@ -11,6 +11,12 @@
racket/draw racket/draw
scheme/class) scheme/class)
(define pink-code-font
(if (and (eq? (system-type) 'macosx)
(member "Courier" (get-face-list)))
"Courier"
'modern))
(require (for-syntax scheme/base)) (require (for-syntax scheme/base))
(provide find-enclosing-loc-wrapper (provide find-enclosing-loc-wrapper
@ -477,7 +483,7 @@
(make-pict-token col col-span (blank)) (make-pict-token col col-span (blank))
(let ([str (apply string (build-list col-span (λ (x) #\space)))]) (let ([str (apply string (build-list col-span (λ (x) #\space)))])
(if unquoted? (if unquoted?
(make-pict-token col col-span (pink-background ((current-text) str 'modern (default-font-size)))) (make-pict-token col col-span (pink-background ((current-text) str pink-code-font (default-font-size))))
(make-string-token col col-span str (default-style)))))) (make-string-token col col-span str (default-style))))))
(define (handle-loc-wrapped lw) (define (handle-loc-wrapped lw)
@ -687,7 +693,7 @@
(list (make-pict-token col span (list (make-pict-token col span
(pink-background (pink-background
((current-text) (if (string? atom) atom (format "~a" atom)) ((current-text) (if (string? atom) atom (format "~a" atom))
'modern pink-code-font
(default-font-size)))))] (default-font-size)))))]
[(and (symbol? atom) [(and (symbol? atom)
(regexp-match #rx"^([^_^]*)_([^^]*)\\^?(.*)$" (symbol->string atom))) (regexp-match #rx"^([^_^]*)_([^^]*)\\^?(.*)$" (symbol->string atom)))
@ -745,7 +751,7 @@
(define (basic-text str style) ((current-text) str style (default-font-size))) (define (basic-text str style) ((current-text) str style (default-font-size)))
(define (non-terminal str) ((current-text) str (non-terminal-style) (default-font-size))) (define (non-terminal str) ((current-text) str (non-terminal-style) (default-font-size)))
(define (unksc str) (pink-background ((current-text) str 'modern (default-font-size)))) (define (unksc str) (pink-background ((current-text) str pink-code-font (default-font-size))))
(define non-terminal-style (make-parameter '(italic . roman))) (define non-terminal-style (make-parameter '(italic . roman)))
(define non-terminal-subscript-style (make-parameter `(subscript . ,(non-terminal-style)))) (define non-terminal-subscript-style (make-parameter `(subscript . ,(non-terminal-style))))
(define non-terminal-superscript-style (make-parameter `(superscript . ,(non-terminal-style)))) (define non-terminal-superscript-style (make-parameter `(superscript . ,(non-terminal-style))))