From 491eeaa75940ececb9f1820a940a3d9547c80f1e Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Sun, 19 Dec 2010 21:59:03 -0500
Subject: [PATCH] Move mred/private/wxme/style to racket/snip/private/style. 
 `racket/snip' now exports the style classes and the add,mult-color
 interfaces.

---
 collects/mred/mred.rkt                              |  9 +--------
 collects/mred/private/editor.rkt                    |  2 +-
 collects/mred/private/filedialog.rkt                |  2 +-
 collects/mred/private/helper.rkt                    |  2 +-
 collects/mred/private/moredialogs.rkt               |  2 +-
 collects/mred/private/path-dialog.rkt               |  2 +-
 collects/mred/private/repl.rkt                      |  2 +-
 collects/mred/private/wxme/editor-data.rkt          |  8 ++++----
 collects/mred/private/wxme/editor-snip-class.rkt    |  1 -
 collects/mred/private/wxme/editor.rkt               |  4 ++--
 collects/mred/private/wxme/pasteboard.rkt           |  1 -
 collects/mred/private/wxme/private.rkt              |  3 +--
 collects/mred/private/wxme/symbol-predicates.rkt    | 13 -------------
 collects/mred/private/wxme/text.rkt                 |  1 -
 collects/mred/private/wxme/wx.rkt                   |  8 ++------
 collects/racket/draw/private/font-syms.rkt          |  5 ++++-
 collects/racket/draw/private/font.rkt               |  3 ---
 collects/racket/snip.rkt                            | 13 +++++++++++--
 collects/racket/snip/private/private.rkt            |  3 ++-
 collects/racket/snip/private/snip.rkt               |  4 ++--
 .../private/wxme => racket/snip/private}/style.rkt  | 11 ++++++-----
 collects/scribblings/gui/editor-classes.scrbl       |  9 ---------
 collects/scribblings/gui/snip-classes.scrbl         |  9 +++++++++
 collects/tests/gracket/wxme.rkt                     |  1 -
 24 files changed, 50 insertions(+), 68 deletions(-)
 delete mode 100644 collects/mred/private/wxme/symbol-predicates.rkt
 rename collects/{mred/private/wxme => racket/snip/private}/style.rkt (99%)

diff --git a/collects/mred/mred.rkt b/collects/mred/mred.rkt
index 6a8a7a3727..bd725f9d6e 100644
--- a/collects/mred/mred.rkt
+++ b/collects/mred/mred.rkt
@@ -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)
diff --git a/collects/mred/private/editor.rkt b/collects/mred/private/editor.rkt
index 7740a207f4..e68b77c969 100644
--- a/collects/mred/private/editor.rkt
+++ b/collects/mred/private/editor.rkt
@@ -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")
diff --git a/collects/mred/private/filedialog.rkt b/collects/mred/private/filedialog.rkt
index a6f24eb06c..9bef19bbe4 100644
--- a/collects/mred/private/filedialog.rkt
+++ b/collects/mred/private/filedialog.rkt
@@ -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"
diff --git a/collects/mred/private/helper.rkt b/collects/mred/private/helper.rkt
index b11e071849..e5dcc03720 100644
--- a/collects/mred/private/helper.rkt
+++ b/collects/mred/private/helper.rkt
@@ -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))
diff --git a/collects/mred/private/moredialogs.rkt b/collects/mred/private/moredialogs.rkt
index 1ee3068d0f..5373840398 100644
--- a/collects/mred/private/moredialogs.rkt
+++ b/collects/mred/private/moredialogs.rkt
@@ -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"
diff --git a/collects/mred/private/path-dialog.rkt b/collects/mred/private/path-dialog.rkt
index 9b81def88a..19b37a51cf 100644
--- a/collects/mred/private/path-dialog.rkt
+++ b/collects/mred/private/path-dialog.rkt
@@ -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%)
diff --git a/collects/mred/private/repl.rkt b/collects/mred/private/repl.rkt
index a98c2c7ae8..173a804401 100644
--- a/collects/mred/private/repl.rkt
+++ b/collects/mred/private/repl.rkt
@@ -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"
diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt
index a36182e43e..59ba72af66 100644
--- a/collects/mred/private/wxme/editor-data.rkt
+++ b/collects/mred/private/wxme/editor-data.rkt
@@ -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"
diff --git a/collects/mred/private/wxme/editor-snip-class.rkt b/collects/mred/private/wxme/editor-snip-class.rkt
index 05aa7c88db..62da1a1f31 100644
--- a/collects/mred/private/wxme/editor-snip-class.rkt
+++ b/collects/mred/private/wxme/editor-snip-class.rkt
@@ -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%
diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt
index 74c99bbbea..7f49397031 100644
--- a/collects/mred/private/wxme/editor.rkt
+++ b/collects/mred/private/wxme/editor.rkt
@@ -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"
diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt
index 1cb11b0848..e3134c9820 100644
--- a/collects/mred/private/wxme/pasteboard.rkt
+++ b/collects/mred/private/wxme/pasteboard.rkt
@@ -9,7 +9,6 @@
          "editor.ss"
          "editor-data.rkt"
          "undo.ss"
-         "style.ss"
          racket/snip
          racket/snip/private/snip-flags
          "standard-snip-admin.rkt"
diff --git a/collects/mred/private/wxme/private.rkt b/collects/mred/private/wxme/private.rkt
index 852ad3b138..8e77adb87b 100644
--- a/collects/mred/private/wxme/private.rkt
+++ b/collects/mred/private/wxme/private.rkt
@@ -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
diff --git a/collects/mred/private/wxme/symbol-predicates.rkt b/collects/mred/private/wxme/symbol-predicates.rkt
deleted file mode 100644
index 27bc0e38de..0000000000
--- a/collects/mred/private/wxme/symbol-predicates.rkt
+++ /dev/null
@@ -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)))
\ No newline at end of file
diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt
index a71ff6d908..3333020be0 100644
--- a/collects/mred/private/wxme/text.rkt
+++ b/collects/mred/private/wxme/text.rkt
@@ -11,7 +11,6 @@
          "editor.ss"
          "editor-data.rkt"
          "undo.ss"
-         "style.ss"
          racket/snip
          racket/snip/private/snip-flags
          "standard-snip-admin.rkt"
diff --git a/collects/mred/private/wxme/wx.rkt b/collects/mred/private/wxme/wx.rkt
index 4ab20d6c39..759edf5bf4 100644
--- a/collects/mred/private/wxme/wx.rkt
+++ b/collects/mred/private/wxme/wx.rkt
@@ -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)
 
diff --git a/collects/racket/draw/private/font-syms.rkt b/collects/racket/draw/private/font-syms.rkt
index 18f7576dc7..a93aea4693 100644
--- a/collects/racket/draw/private/font-syms.rkt
+++ b/collects/racket/draw/private/font-syms.rkt
@@ -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)))
+
diff --git a/collects/racket/draw/private/font.rkt b/collects/racket/draw/private/font.rkt
index 4b53b93acf..77d6dc21d1 100644
--- a/collects/racket/draw/private/font.rkt
+++ b/collects/racket/draw/private/font.rkt
@@ -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)))
 
diff --git a/collects/racket/snip.rkt b/collects/racket/snip.rkt
index 214201acd0..5086e947a2 100644
--- a/collects/racket/snip.rkt
+++ b/collects/racket/snip.rkt
@@ -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"))
\ No newline at end of file
+(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"))
\ No newline at end of file
diff --git a/collects/racket/snip/private/private.rkt b/collects/racket/snip/private/private.rkt
index 59bc66ca06..ba6b5338d8 100644
--- a/collects/racket/snip/private/private.rkt
+++ b/collects/racket/snip/private/private.rkt
@@ -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)
diff --git a/collects/racket/snip/private/snip.rkt b/collects/racket/snip/private/snip.rkt
index 377b5021c2..6ae66341a2 100644
--- a/collects/racket/snip/private/snip.rkt
+++ b/collects/racket/snip/private/snip.rkt
@@ -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%
diff --git a/collects/mred/private/wxme/style.rkt b/collects/racket/snip/private/style.rkt
similarity index 99%
rename from collects/mred/private/wxme/style.rkt
rename to collects/racket/snip/private/style.rkt
index 186851b848..ffe0f9d990 100644
--- a/collects/mred/private/wxme/style.rkt
+++ b/collects/racket/snip/private/style.rkt
@@ -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)
diff --git a/collects/scribblings/gui/editor-classes.scrbl b/collects/scribblings/gui/editor-classes.scrbl
index c90bd8b307..dbd346a9da 100644
--- a/collects/scribblings/gui/editor-classes.scrbl
+++ b/collects/scribblings/gui/editor-classes.scrbl
@@ -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"]
diff --git a/collects/scribblings/gui/snip-classes.scrbl b/collects/scribblings/gui/snip-classes.scrbl
index 6afe9a3d58..03d9138342 100644
--- a/collects/scribblings/gui/snip-classes.scrbl
+++ b/collects/scribblings/gui/snip-classes.scrbl
@@ -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"]
diff --git a/collects/tests/gracket/wxme.rkt b/collects/tests/gracket/wxme.rkt
index a5d3c73ec7..a4b8f3f66e 100644
--- a/collects/tests/gracket/wxme.rkt
+++ b/collects/tests/gracket/wxme.rkt
@@ -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