Moved bracket-graphics submodule into separate file. Graphics now works in #lang bracket files

This commit is contained in:
Jens Axel Søgaard 2012-06-21 17:31:49 +02:00
parent df58ce2b2f
commit db41d6d1b7
2 changed files with 5 additions and 29 deletions

View File

@ -1,26 +1,5 @@
#lang racket #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 ;;; An ATOMIC EXPRESSION is an
; - number (integer, real, complex) ; - number (integer, real, complex)
; - reserved symbol (pi, e, i, inf, true, false) ; - reserved symbol (pi, e, i, inf, true, false)
@ -808,13 +787,13 @@
(module bracket racket (module bracket racket
(require (submod ".." number-theory) (require (submod ".." number-theory)
(submod ".." expression) (submod ".." expression)
(submod ".." undefined) (submod ".." undefined)
(submod ".." equation-expression) (submod ".." equation-expression)
;(submod ".." bracket-graphics) "graphics.rkt")
)
(provide ; (all-from-out (submod ".." symbolic-application)) (provide ; (all-from-out (submod ".." symbolic-application))
(rename-out [free-of Free-of] (rename-out [free-of Free-of]
[base Base] [base Base]
@ -823,7 +802,7 @@
[exponent Exponent] [exponent Exponent]
[before? Before?] [before? Before?]
[kind Kind]) [kind Kind])
;(all-from-out (submod ".." bracket-graphics)) (all-from-out "graphics.rkt")
Operand Operand
Operands Operands
Hold Hold
@ -1352,10 +1331,7 @@
(check-equal? (Expand (Power (Plus a b) 2)) (check-equal? (Expand (Power (Plus a b) 2))
(Plus (Power a 2) (Times 2 a b) (Power b 2))) (Plus (Power a 2) (Times 2 a b) (Power b 2)))
(check-equal? (Expand (Times a (Plus x y))) (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) #;(require (submod "." symbolic-application)

View File

@ -24,4 +24,4 @@ dot(a,b);
norm(a); norm(a);
norm(b); norm(b);
proj(a,b); proj(a,b);
line({x0,y0},{z,w}) line({x0,y0},{z,w});