simplify lang modules

main-base.rkt

@@ -3,11 +3,14 @@
 
 (provide (all-defined-out) (all-from-out pollen/world))
 
-(define-syntax (make-new-module-begin stx)
+(define-syntax (define+provide-new-module-begin stx)
   (syntax-case stx ()
     [(_ mode-arg)
      (with-syntax ([new-module-begin (format-id stx "new-module-begin")])
-       #'(define-syntax (new-module-begin stx-arg)
+       #'(begin
+           (provide (except-out (all-from-out racket/base) #%module-begin)
+                    (rename-out [new-module-begin #%module-begin]))
+           (define-syntax (new-module-begin stx-arg)
              (syntax-case stx-arg ()
                [(_ body-exprs (... ...))
                 (syntax-protect 
@@ -98,4 +101,4 @@
                     (module+ main
                       (if (equal? parser-mode world:mode-preproc)
                           (display doc)
-                        (print doc)))))])))]))
+                          (print doc)))))]))))]))

main.rkt

@@ -1,7 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-
+(define+provide-new-module-begin world:mode-preproc)
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [new-module-begin #%module-begin]))
-
-(make-new-module-begin world:mode-preproc)

markdown.rkt

@@ -1,7 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-
+(define+provide-new-module-begin world:mode-markdown)
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [new-module-begin #%module-begin]))
-
-(make-new-module-begin world:mode-markdown)

markup.rkt

@@ -1,7 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-
+(define+provide-new-module-begin world:mode-markup)
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [new-module-begin #%module-begin]))
-
-(make-new-module-begin world:mode-markup)

pre.rkt

@@ -1,7 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-
+(define+provide-new-module-begin world:mode-preproc)
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [new-module-begin #%module-begin]))
-
-(make-new-module-begin world:mode-preproc)

ptree.rkt

@@ -1,7 +1,3 @@
 #lang racket/base
 (require pollen/main-base)
-
+(define+provide-new-module-begin world:mode-pagetree)
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [new-module-begin #%module-begin]))
-
-(make-new-module-begin world:mode-pagetree)