From db41d6d1b7e7c8cf4a51255e358eae84df73e05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Axel=20S=C3=B8gaard?= <jensaxel@soegaard.net>
Date: Thu, 21 Jun 2012 17:31:49 +0200
Subject: [PATCH] Moved bracket-graphics submodule into separate file. Graphics
 now works in #lang bracket files

---
 bracket/bracket.rkt       | 32 ++++----------------------------
 bracket/tests/testing.rkt |  2 +-
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/bracket/bracket.rkt b/bracket/bracket.rkt
index 2879cd6b1..224325647 100644
--- a/bracket/bracket.rkt
+++ b/bracket/bracket.rkt
@@ -1,26 +1,5 @@
 #lang racket
 
-#;(module bracket-graphics racket
-  (require "../graphics/graphics.rkt")
-  
-  (define-syntax (declare/provide-vars stx)
-    (syntax-case stx ()
-      [(_ id ...)
-       #'(begin
-           (define id 'id) ...
-           (provide id) ...)]))
-  
-  (provide Graphics)
-  
-  (declare/provide-vars
-   Blend Darker Hue Lighter
-   Circle Disk Line Point Rectangle
-   Text Thickness
-   ; Colors
-   Red Blue Green Black White Yellow
-   ; Options
-   ImageSize PlotRange))
-
 ;;; An ATOMIC EXPRESSION is an
 ;  - number (integer, real, complex)
 ;  - reserved symbol (pi, e, i, inf, true, false)
@@ -808,13 +787,13 @@
 
 
 
+
 (module bracket racket
   (require (submod ".." number-theory)
            (submod ".." expression)
            (submod ".." undefined)
            (submod ".." equation-expression)
-           ;(submod ".." bracket-graphics)
-           )
+           "graphics.rkt")
   (provide ; (all-from-out (submod ".." symbolic-application))
    (rename-out [free-of Free-of]
                [base Base]
@@ -823,7 +802,7 @@
                [exponent Exponent]
                [before? Before?]
                [kind Kind])
-   ;(all-from-out (submod ".." bracket-graphics))
+   (all-from-out "graphics.rkt")
    Operand
    Operands
    Hold
@@ -1352,10 +1331,7 @@
   (check-equal? (Expand (Power (Plus a b) 2))
                 (Plus (Power a 2) (Times 2 a b) (Power b 2)))
   (check-equal? (Expand (Times a (Plus x y)))
-                (Plus (Times a x) (Times a y)))
-  
-  
-  )
+                (Plus (Times a x) (Times a y))))
 
 
 #;(require (submod "." symbolic-application)
diff --git a/bracket/tests/testing.rkt b/bracket/tests/testing.rkt
index b5b0b0ce3..75fb96545 100644
--- a/bracket/tests/testing.rkt
+++ b/bracket/tests/testing.rkt
@@ -24,4 +24,4 @@ dot(a,b);
 norm(a);
 norm(b);
 proj(a,b);
-line({x0,y0},{z,w})
+line({x0,y0},{z,w});