From e0edc702150b11541c1e1861d3832fdff3115fd7 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Fri, 15 Aug 2008 04:11:31 +0000
Subject: [PATCH] svn: r11269

---
 collects/redex/HISTORY                       |   3 +
 collects/redex/pict.ss                       |  14 ++-
 collects/redex/private/bitmap-test.ss        | 101 ++++++++++---------
 collects/redex/private/bmps/language-nox.png | Bin 0 -> 3016 bytes
 collects/redex/redex.scrbl                   |   9 +-
 5 files changed, 65 insertions(+), 62 deletions(-)
 create mode 100644 collects/redex/private/bmps/language-nox.png

diff --git a/collects/redex/HISTORY b/collects/redex/HISTORY
index 27bde4a65f..555d9a7a6a 100644
--- a/collects/redex/HISTORY
+++ b/collects/redex/HISTORY
@@ -3,6 +3,9 @@ v4.2
   - added white-bracket-sizing to control how the brackets
     are typeset when rendering a metafunction.
 
+  - added render-* functions that make it easier to experiment
+    with typesetting at the REPL.
+
 v4.1 (this is the first version that was included in the PLT
       distribution. Before this, Redex was in PLaneT).
 
diff --git a/collects/redex/pict.ss b/collects/redex/pict.ss
index b26fb97032..cfe27898f0 100644
--- a/collects/redex/pict.ss
+++ b/collects/redex/pict.ss
@@ -21,10 +21,9 @@
   (->d ([rel reduction-relation?])
        ([file (or/c false/c path-string?)]
         #:style [style reduction-rule-style/c])
-       [result (lambda (x)
-                 (if (path-string? file)
-                     (void? x)
-                     (pict? x)))])]
+       [result (if (path-string? file)
+                   void?
+                   pict?)])]
  [reduction-relation->pict (->* (reduction-relation?)
                                 (#:style reduction-rule-style/c)
                                 pict?)]
@@ -37,10 +36,9 @@
   (->d ([lang compiled-lang?])
        ([file (or/c false/c path-string?)]
         #:nts [nts (or/c false/c (listof (or/c string? symbol?)))])
-       [result (lambda (x) 
-                 (if (path-string? file)
-                     (void? x)
-                     (pict? x)))])])
+       [result (if (path-string? file)
+                   void?
+                   pict?)])])
 
 ; syntax
 (provide metafunction->pict
diff --git a/collects/redex/private/bitmap-test.ss b/collects/redex/private/bitmap-test.ss
index 7b91078e4c..0746e6f8fd 100644
--- a/collects/redex/private/bitmap-test.ss
+++ b/collects/redex/private/bitmap-test.ss
@@ -1,50 +1,53 @@
-(module bitmap-test mzscheme
-  (require "bitmap-test-util.ss"
-           "../main.ss")
-  
-  ;; tests: 
-  ;;  - language,
-  ;;  - multi-line non-terminals, single-line non-terminals
-  (define-language lang
-    (e (e e) 
-       x
-       (λ (x) e)
-       number)
-    (v number (λ (x) e))
-    ((x y) variable-not-otherwise-mentioned))
-  (test (render-language lang) "language.png")
-  
-  (define-extended-language lang++ lang
-    (e .... number (+ e e))
-    (v .... number))
-  
-  (test (render-language lang++) "extended-language.png")
-  
-  (define red
-    (reduction-relation
-     lang
-     (--> ((λ (x) e) v) (S x v e))))
-  
-  ;; tests: reduction-relation
-  (test (render-reduction-relation red)
-        "reduction-relation.png")
+#lang scheme
+(require "bitmap-test-util.ss"
+         "../main.ss")
 
-  (test (render-reduction-relation 
-         (extend-reduction-relation red lang (--> 1 2)))
-        "extended-reduction-relation.png")
-  
-  (define-metafunction lang
-    [(S x v e) e])
-  
-  (test (render-metafunction S)
-        "metafunction.png")
-  
-  ;; in this test, teh `x' is italic and the 'z' is sf, since 'x' is in the grammar, and 'z' is not.
-  (test (render-lw 
-         lang 
-         (to-lw ((λ (x) (x x))
-                 (λ (z) (z z)))))
-        "lw.png")
-  
-  (printf "bitmap-test.ss: ")
-  (done))
+;; tests: 
+;;  - language,
+;;  - multi-line non-terminals, single-line non-terminals
+(define-language lang
+  (e (e e) 
+     x
+     (λ (x) e)
+     number)
+  (v number (λ (x) e))
+  ((x y) variable-not-otherwise-mentioned))
+
+(test (render-language lang) "language.png")
+
+(test (render-language lang #:nts '(e v)) "language-nox.png")
+
+(define-extended-language lang++ lang
+  (e .... number (+ e e))
+  (v .... number))
+
+(test (render-language lang++) "extended-language.png")
+
+(define red
+  (reduction-relation
+   lang
+   (--> ((λ (x) e) v) (S x v e))))
+
+;; tests: reduction-relation
+(test (render-reduction-relation red)
+      "reduction-relation.png")
+
+(test (render-reduction-relation 
+       (extend-reduction-relation red lang (--> 1 2)))
+      "extended-reduction-relation.png")
+
+(define-metafunction lang
+  [(S x v e) e])
+
+(test (render-metafunction S)
+      "metafunction.png")
+
+;; in this test, teh `x' is italic and the 'z' is sf, since 'x' is in the grammar, and 'z' is not.
+(test (render-lw 
+       lang 
+       (to-lw ((λ (x) (x x))
+               (λ (z) (z z)))))
+      "lw.png")
+
+(printf "bitmap-test.ss: ")
+(done)
diff --git a/collects/redex/private/bmps/language-nox.png b/collects/redex/private/bmps/language-nox.png
new file mode 100644
index 0000000000000000000000000000000000000000..107fbde941ed50b9acb4e11155dc73ebbfd66600
GIT binary patch
literal 3016
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
CPxqk!

literal 0
HcmV?d00001

diff --git a/collects/redex/redex.scrbl b/collects/redex/redex.scrbl
index cadbb8c47d..fcb19a9600 100644
--- a/collects/redex/redex.scrbl
+++ b/collects/redex/redex.scrbl
@@ -1191,14 +1191,13 @@ are otherwise setting @scheme[dc-for-text-size].  }
 Produce a pict like @scheme[render-language], but without
 adjust @scheme[dc-for-text-size].
 
-This function is
-primarily designed to be used with Slideshow or with
-other tools that combine picts together.
+This function is primarily designed to be used with
+Slideshow or with other tools that combine picts together.
 }
 
 @defproc[(render-reduction-relation [rel reduction-relation?]
-                          [file (or/c false/c path-string?) #f]
-                          [#:style style reduction-rule-style/c (rule-pict-style)])
+                                    [file (or/c false/c path-string?) #f]
+                                    [#:style style reduction-rule-style/c (rule-pict-style)])
          (if file void? pict?)]{
 
 Renders a reduction relation. If @scheme[file] is @scheme[#f],