suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move mred/private/wxme/style to racket/snip/private/style.

Browse Source 
`racket/snip' now exports the style classes and the add,mult-color interfaces.
This commit is contained in:
Sam Tobin-Hochstadt 2010-12-19 21:59:03 -05:00
parent 975c2400a1
commit 491eeaa759
24 changed files with 50 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collects/mred/mred.rkt
View File

@ -7,7 +7,6 @@
racket/draw racket/snip
mzlib/etc
(prefix wx: "private/kernel.ss")
(prefix wx: "private/wxme/style.ss")
(prefix wx: "private/wxme/editor.ss")
(prefix wx: "private/wxme/text.ss")
(prefix wx: "private/wxme/pasteboard.ss")
@ -95,8 +94,7 @@
(define n k:n) ...
(provide n ...)))))])))
(propagate add-color<%>
add-editor-keymap-functions
(propagate add-editor-keymap-functions
add-text-keymap-functions
add-pasteboard-keymap-functions
begin-busy-cursor
@ -134,7 +132,6 @@
editor-stream-out-bytes-base%
editor-wordbreak-map%
mouse-event%
mult-color<%>
read-editor-global-footer
read-editor-global-header
read-editor-version
@ -143,9 +140,6 @@
special-option-key
map-command-as-meta-key
label->plain-label
style<%>
style-delta%
style-list%
write-editor-global-footer
write-editor-global-header
write-editor-version
@ -154,7 +148,6 @@
eventspace-shutdown?
get-panel-background
the-style-list
the-editor-wordbreak-map
make-screen-bitmap
make-gl-bitmap)

2
collects/mred/private/editor.rkt
View File

@ -5,7 +5,7 @@
mzlib/list
mzlib/file
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
(prefix wx: "wxme/keymap.ss")
(prefix wx: "wxme/editor.ss")
(prefix wx: "wxme/text.ss")

2
collects/mred/private/filedialog.rkt
View File

@ -3,7 +3,7 @@
mzlib/etc
mzlib/list
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
(prefix wx: "wxme/cycle.ss")
"lock.ss"
"wx.ss"

2
collects/mred/private/helper.rkt
View File

@ -1,7 +1,7 @@
(module helper mzscheme
(require mzlib/class
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
"lock.ss")
(provide (protect (struct child-info (x-min y-min x-margin y-margin x-stretch y-stretch))

2
collects/mred/private/moredialogs.rkt
View File

@ -3,7 +3,7 @@
mzlib/etc
mzlib/list
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
"lock.ss"
"const.ss"
"check.ss"

2
collects/mred/private/path-dialog.rkt
View File

@ -1,7 +1,7 @@
(module path-dialog mzscheme
(require mzlib/class mzlib/list mzlib/string mzlib/file
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
"helper.ss" "mrtop.ss" "mritem.ss" "mrpanel.ss" "mrtextfield.ss"
"messagebox.ss" "mrmenu.ss" (only scheme/base compose))
(provide path-dialog%)

2
collects/mred/private/repl.rkt
View File

@ -2,7 +2,7 @@
(require mzlib/class
mzlib/class100
(prefix wx: "kernel.ss")
(prefix wx: "wxme/style.ss")
(prefix wx: racket/snip)
"editor.ss"
"app.ss"
"mrtop.ss"

8
collects/mred/private/wxme/editor-data.rkt
View File

@ -3,12 +3,12 @@
(require scheme/class
scheme/file file/convertible
"../syntax.ss"
racket/snip/private/snip-flags
"private.ss"
racket/snip/private/snip-flags
racket/snip/private/private
"style.ss"
racket/snip/private/load-one
(only-in "cycle.ss"
racket/snip/private/style
racket/snip/private/load-one
(only-in "cycle.ss"
editor-stream-in% editor-stream-out%
get-editor-data-class set-get-editor-data-class!)
"../wx/common/event.rkt"

1
collects/mred/private/wxme/editor-snip-class.rkt
View File

@ -6,7 +6,6 @@
racket/snip/private/snip-flags
"private.ss"
racket/snip/private/private
"style.ss"
racket/snip
(only-in "cycle.ss"
editor-stream-in% editor-stream-out%

4
collects/mred/private/wxme/editor.rkt
View File

@ -4,9 +4,9 @@
scheme/file
"../syntax.ss"
"private.ss"
racket/snip/private/private
"style.ss"
racket/snip
racket/snip/private/private
racket/snip/private/style
racket/snip/private/snip-flags
"editor-admin.ss"
"stream.ss"

1
collects/mred/private/wxme/pasteboard.rkt
View File

@ -9,7 +9,6 @@
"editor.ss"
"editor-data.rkt"
"undo.ss"
"style.ss"
racket/snip
racket/snip/private/snip-flags
"standard-snip-admin.rkt"

3
collects/mred/private/wxme/private.rkt
View File

@ -82,8 +82,7 @@
(define-local-member-name
set-s-read-format
get-s-read-format
set-s-read-version
get-wxme-version)
set-s-read-version)
;; editor-snip%
(define-local-member-name

13
collects/mred/private/wxme/symbol-predicates.rkt
View File

@ -1,13 +0,0 @@
#lang racket/base
(provide (all-defined-out))
(define (family-symbol? s)
(memq s '(default decorative roman script
swiss modern symbol system)))
(define (style-symbol? s)
(memq s '(normal italic slant)))
(define (weight-symbol? s)
(memq s '(normal bold light)))
(define (smoothing-symbol? s)
(memq s '(default smoothed unsmoothed partly-smoothed)))

1
collects/mred/private/wxme/text.rkt
View File

@ -11,7 +11,6 @@
"editor.ss"
"editor-data.rkt"
"undo.ss"
"style.ss"
racket/snip
racket/snip/private/snip-flags
"standard-snip-admin.rkt"

8
collects/mred/private/wxme/wx.rkt
View File

@ -1,5 +1,5 @@
#lang scheme/base
(require "../kernel.ss" "symbol-predicates.rkt")
(require "../kernel.ss" racket/draw/private/font-syms)
(define the-clipboard (get-the-clipboard))
(define the-x-selection-clipboard (get-the-x-selection))
@ -7,7 +7,7 @@
(define (size? v) (and (exact-positive-integer? v)
(byte? v)))
(provide (all-from-out "symbol-predicates.rkt")
(provide (all-from-out racket/draw/private/font-syms)
event%
mouse-event%
key-event%
@ -39,10 +39,6 @@
hide-cursor
run-printout
current-ps-setup
family-symbol?
style-symbol?
weight-symbol?
smoothing-symbol?
get-highlight-background-color
get-highlight-text-color)

5
collects/racket/draw/private/font-syms.rkt
View File

@ -1,6 +1,6 @@
#lang scheme/base
(provide family-symbol? style-symbol? weight-symbol? )
(provide family-symbol? style-symbol? weight-symbol? smoothing-symbol?)
(define (family-symbol? s)
(memq s '(default decorative roman script
@ -12,3 +12,6 @@
(define (weight-symbol? s)
(memq s '(normal bold light)))
(define (smoothing-symbol? s)
(memq s '(default smoothed unsmoothed partly-smoothed)))

3
collects/racket/draw/private/font.rkt
View File

@ -25,9 +25,6 @@
PANGO_UNDERLINE_SINGLE))
l))
(define (smoothing-symbol? s)
(memq s '(default smoothed unsmoothed partly-smoothed)))
(define (size? v) (and (exact-positive-integer? v)
(byte? v)))

13
collects/racket/snip.rkt
View File

@ -1,3 +1,12 @@
#lang racket/base
(require "snip/private/snip.rkt" "snip/private/snip-admin.rkt")
(provide (all-from-out "snip/private/snip.rkt" "snip/private/snip-admin.rkt"))
(require "snip/private/snip.rkt"
"snip/private/snip-admin.rkt"
"snip/private/style.rkt")
(provide mult-color<%>
add-color<%>
style-delta%
style<%>
style-list%
the-style-list
(all-from-out "snip/private/snip.rkt"
"snip/private/snip-admin.rkt"))

3
collects/racket/snip/private/private.rkt
View File

@ -53,4 +53,5 @@
do-reading-version
do-map-position
do-get-header-flag
do-set-header-flag)
do-set-header-flag
get-wxme-version)

4
collects/racket/snip/private/snip.rkt
View File

@ -3,9 +3,9 @@
scheme/file file/convertible
"snip-flags.ss"
"load-one.rkt"
racket/draw/private/syntax
mred/private/wxme/style
"style.rkt"
"private.rkt"
racket/draw/private/syntax
racket/draw)
(provide snip%

11
collects/mred/private/wxme/style.rkt → collects/racket/snip/private/style.rkt
View File

@ -3,11 +3,9 @@
scheme/file
(for-syntax scheme/base)
racket/draw
"../syntax.ss"
"cycle.ss"
"private.ss"
racket/snip/private/private
"symbol-predicates.rkt")
racket/draw/private/syntax
racket/draw/private/font-syms
racket/snip/private/private)
(provide mult-color<%>
add-color<%>
@ -20,6 +18,9 @@
read-styles-from-file
write-styles-to-file)
;; for contracts
(define editor-stream-out% object%)
(define default-size
(or (get-preference 'MrEd:default-font-size)
(case (system-type)

9
collects/scribblings/gui/editor-classes.scrbl
View File

@ -16,10 +16,6 @@ Displays, Administrators, and Mappings:
@diagram->table[editor-admin-diagram]
Styles:
@diagram->table[style-diagram]
Streams for Saving and Cut-and-Paste:
@diagram->table[stream-diagram]
@ -28,7 +24,6 @@ Alphabetical:
@local-table-of-contents[]
@include-section["add-color-intf.scrbl"]
@include-section["editor-intf.scrbl"]
@include-section["editor-admin-class.scrbl"]
@include-section["editor-canvas-class.scrbl"]
@ -45,9 +40,5 @@ Alphabetical:
@include-section["editor-stream-out-bytes-base-class.scrbl"]
@include-section["editor-wordbreak-map-class.scrbl"]
@include-section["keymap-class.scrbl"]
@include-section["mult-color-intf.scrbl"]
@include-section["pasteboard-class.scrbl"]
@include-section["style-intf.scrbl"]
@include-section["style-delta-class.scrbl"]
@include-section["style-list-class.scrbl"]
@include-section["text-class.scrbl"]

9
collects/scribblings/gui/snip-classes.scrbl
View File

@ -18,15 +18,24 @@ Snip Lists:
@diagram->table[snip-list-diagram]
Styles:
@diagram->table[style-diagram]
Alphabetical:
@local-table-of-contents[]
@include-section["add-color-intf.scrbl"]
@include-section["image-snip-class.scrbl"]
@include-section["mult-color-intf.scrbl"]
@include-section["readable-snip-intf.scrbl"]
@include-section["snip-class.scrbl"]
@include-section["snip-admin-class.scrbl"]
@include-section["snip-class-class.scrbl"]
@include-section["snip-class-list-intf.scrbl"]
@include-section["string-snip-class.scrbl"]
@include-section["style-intf.scrbl"]
@include-section["style-delta-class.scrbl"]
@include-section["style-list-class.scrbl"]
@include-section["tab-snip-class.scrbl"]

1
collects/tests/gracket/wxme.rkt
View File

@ -9,7 +9,6 @@
mouse-event%)
racket/snip
mred/private/wxme/mline
mred/private/wxme/style
mred/private/wxme/editor
mred/private/wxme/text
mred/private/wxme/pasteboard