From 63bda7b18654f4d1c2831d61e22bd381dc031f59 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Mon, 17 Mar 2014 19:54:34 -0700
Subject: [PATCH] simplifications

---
 lang/reader-base.rkt     | 4 ++--
 lang/reader.rkt          | 3 +--
 main-base.rkt            | 2 +-
 main.rkt                 | 2 +-
 markdown.rkt             | 2 +-
 markdown/lang/reader.rkt | 3 +--
 markup.rkt               | 2 +-
 markup/lang/reader.rkt   | 3 +--
 pagetree/lang/reader.rkt | 3 +--
 pre.rkt                  | 2 +-
 pre/lang/reader.rkt      | 3 +--
 ptree.rkt                | 2 +-
 12 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/lang/reader-base.rkt b/lang/reader-base.rkt
index 32a0276..bb128ff 100644
--- a/lang/reader-base.rkt
+++ b/lang/reader-base.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (only-in scribble/reader make-at-reader) pollen/world racket/path pollen/project-requires)
 
-(provide make-reader-with-mode (all-from-out pollen/world))
+(provide define+provide-reader-in-mode (all-from-out pollen/world))
 
 
 (define read-inner (make-at-reader 
@@ -28,7 +28,7 @@
                    file-contents)))
 
 
-(define-syntax-rule (make-reader-with-mode mode)
+(define-syntax-rule (define+provide-reader-in-mode mode)
   (begin
     (define reader-mode mode)
     (define custom-read-syntax (make-custom-read-syntax reader-mode))
diff --git a/lang/reader.rkt b/lang/reader.rkt
index 33a2153..c443f35 100644
--- a/lang/reader.rkt
+++ b/lang/reader.rkt
@@ -1,4 +1,3 @@
 #lang racket/base
 (require pollen/lang/reader-base)
-
-(make-reader-with-mode world:mode-auto)
\ No newline at end of file
+(define+provide-reader-in-mode world:mode-auto)
\ No newline at end of file
diff --git a/main-base.rkt b/main-base.rkt
index 1494941..397121f 100644
--- a/main-base.rkt
+++ b/main-base.rkt
@@ -3,7 +3,7 @@
 
 (provide (all-defined-out) (all-from-out pollen/world))
 
-(define-syntax (define+provide-new-module-begin stx)
+(define-syntax (define+provide-module-begin-in-mode stx)
   (syntax-case stx ()
     [(_ mode-arg)
      (with-syntax ([new-module-begin (format-id stx "new-module-begin")])
diff --git a/main.rkt b/main.rkt
index 7d10443..0db9baf 100644
--- a/main.rkt
+++ b/main.rkt
@@ -1,3 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-new-module-begin world:mode-preproc)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-preproc)
\ No newline at end of file
diff --git a/markdown.rkt b/markdown.rkt
index 786d0fa..176b1fa 100644
--- a/markdown.rkt
+++ b/markdown.rkt
@@ -1,3 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-new-module-begin world:mode-markdown)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-markdown)
\ No newline at end of file
diff --git a/markdown/lang/reader.rkt b/markdown/lang/reader.rkt
index ed9bb65..ddd711d 100644
--- a/markdown/lang/reader.rkt
+++ b/markdown/lang/reader.rkt
@@ -1,4 +1,3 @@
 #lang racket/base
 (require pollen/lang/reader-base)
-
-(make-reader-with-mode world:mode-markdown)
\ No newline at end of file
+(define+provide-reader-in-mode world:mode-markdown)
\ No newline at end of file
diff --git a/markup.rkt b/markup.rkt
index ed4ca55..6d4fee4 100644
--- a/markup.rkt
+++ b/markup.rkt
@@ -1,3 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-new-module-begin world:mode-markup)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-markup)
\ No newline at end of file
diff --git a/markup/lang/reader.rkt b/markup/lang/reader.rkt
index 5a9abe4..7f6545f 100644
--- a/markup/lang/reader.rkt
+++ b/markup/lang/reader.rkt
@@ -1,4 +1,3 @@
 #lang racket/base
 (require pollen/lang/reader-base)
-
-(make-reader-with-mode world:mode-markup)
\ No newline at end of file
+(define+provide-reader-in-mode world:mode-markup)
\ No newline at end of file
diff --git a/pagetree/lang/reader.rkt b/pagetree/lang/reader.rkt
index 32c175d..222b526 100644
--- a/pagetree/lang/reader.rkt
+++ b/pagetree/lang/reader.rkt
@@ -1,4 +1,3 @@
 #lang racket/base
 (require pollen/lang/reader-base)
-
-(make-reader-with-mode world:mode-pagetree)
\ No newline at end of file
+(define+provide-reader-in-mode world:mode-pagetree)
\ No newline at end of file
diff --git a/pre.rkt b/pre.rkt
index 7d10443..0db9baf 100644
--- a/pre.rkt
+++ b/pre.rkt
@@ -1,3 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-new-module-begin world:mode-preproc)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-preproc)
\ No newline at end of file
diff --git a/pre/lang/reader.rkt b/pre/lang/reader.rkt
index 38223cd..07d4ced 100644
--- a/pre/lang/reader.rkt
+++ b/pre/lang/reader.rkt
@@ -1,4 +1,3 @@
 #lang racket/base
 (require pollen/lang/reader-base)
-
-(make-reader-with-mode world:mode-preproc)
\ No newline at end of file
+(define+provide-reader-in-mode world:mode-preproc)
\ No newline at end of file
diff --git a/ptree.rkt b/ptree.rkt
index cdce8de..6c03437 100644
--- a/ptree.rkt
+++ b/ptree.rkt
@@ -1,3 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-new-module-begin world:mode-pagetree)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-pagetree)
\ No newline at end of file