simplify

info.rkt

@@ -2,7 +2,7 @@
 (define collection 'multi)
 
 (define version "1.0")
-(define deps '("base" "txexpr" "sugar" ("markdown" #:version "0.18") "htdp"
+(define deps '("base" ["txexpr" #:version "0.2"] ["sugar" #:version "0.2"] ["markdown" #:version "0.18"] "htdp"
                "at-exp-lib" "html-lib" "rackjure" "web-server-lib" "scribble-text-lib" "rackunit-lib"
                "gui-lib"))
 (define build-deps '("plot-gui-lib" "scribble-lib" "racket-doc" "rackunit-doc"

pollen/core.rkt

@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base "setup.rkt" "private/splice.rkt"))
-(require txexpr xml/path sugar/define sugar/coerce sugar/test racket/string)
+(require txexpr/base xml/path sugar/define sugar/coerce sugar/test racket/string)
 (require "private/file-utils.rkt"
          "setup.rkt"
          "cache.rkt"

pollen/decode.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require xml txexpr racket/list sugar/list sugar/define sugar/test)
+(require xml txexpr/base racket/list sugar/list sugar/define sugar/test)
 (require "setup.rkt" "private/splice.rkt")
 
 (require "unstable/typography.rkt")

pollen/pagetree.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/path racket/list sugar txexpr)
+(require racket/path racket/list sugar txexpr/base)
 (require "setup.rkt"
          "private/whitespace.rkt"
          "private/file-utils.rkt"

pollen/private/file-utils.rkt

@@ -145,7 +145,6 @@
  (check-false (has-inner-poly-ext? "foo.poly"))
  (check-false (has-inner-poly-ext? "foo.wrong.pm")))
 
-
 (define-syntax (make-source-utility-functions stx)
   (syntax-case stx ()
     [(_ stem)

pollen/private/project-server-routes.rkt

@@ -5,7 +5,7 @@
 (require web-server/http/request-structs)
 (require web-server/http/response-structs)
 (require 2htdp/image)
-(require "../setup.rkt" "../render.rkt" sugar sugar/unstable/string sugar/unstable/misc sugar/unstable/container txexpr "file-utils.rkt" "debug.rkt" "../pagetree.rkt" "../cache.rkt")
+(require "../setup.rkt" "../render.rkt" sugar sugar/unstable/string sugar/unstable/misc sugar/unstable/container txexpr/base "file-utils.rkt" "debug.rkt" "../pagetree.rkt" "../cache.rkt")
 
 (module+ test (require rackunit))
 

pollen/private/runtime-config.rkt

@@ -17,7 +17,7 @@
           (display doc)
           ;; OK to use dynamic-require because runtime-config itself is dynamic-required
           (print (with-handlers ([exn:fail? (λ(exn) ((error '|pollen markup error| ((dynamic-require 'racket/string 'string-join) (cdr ((dynamic-require 'racket/string 'string-split) (exn-message exn) ": ")) ": "))))])
-                   ((dynamic-require 'txexpr 'validate-txexpr) doc)))))))
+                   ((dynamic-require 'txexpr/base 'validate-txexpr) doc)))))))
 
 (require 'show)
 

pollen/scribblings/third-tutorial-files/pollen.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require pollen/decode pollen/misc/tutorial txexpr)
+(require pollen/decode pollen/misc/tutorial txexpr/base)
 (define (root . elements)
    (txexpr 'root null (decode-elements elements
      #:txexpr-elements-proc decode-paragraphs

pollen/tag.rkt

@@ -1,6 +1,6 @@
 #lang pollen/mode racket/base
 (require (for-syntax racket/base syntax/parse))
-(require txexpr racket/string racket/match)
+(require txexpr/base racket/string racket/match)
 (provide default-tag-function make-default-tag-function define-tag-function)
 
 (define first car)
@@ -51,7 +51,7 @@
 (define make-default-tag-function default-tag-function) ; bw compat
 
 (module+ test
-  (require rackunit)
+  (require rackunit txexpr/check)
   (define outerdiv (default-tag-function 'div #:class "outer" #:style "outer"))
   (check-txexprs-equal? (outerdiv "foo") '(div ((class "outer") (style "outer")) "foo"))
   (check-txexprs-equal? (outerdiv) '(div ((class "outer") (style "outer"))))

pollen/template/html.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require sugar/define sugar/test txexpr)
+(require sugar/define sugar/test txexpr/base)
 
 (define (trim-outer-tag html)
   (define matches (regexp-match #px"^<.*?>(.*)</.*?>$" html))

pollen/unstable/convert.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require sugar txexpr racket/list racket/string pollen/setup xml html racket/file racket/match "html.rkt" net/url racket/port)
+(require sugar txexpr/base racket/list racket/string pollen/setup xml html racket/file racket/match "html.rkt" net/url racket/port)
 
 (define (attrs->pollen attrs)
   (string-join (flatten (map (λ(pair) (list (format "'~a:" (car pair)) (format "\"~a\"" (cadr pair)))) attrs)) " "))

pollen/unstable/typography.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/list sugar/define sugar/test txexpr racket/match sugar/unstable/container sugar/coerce sugar/unstable/len  "../private/whitespace.rkt")
+(require racket/list sugar/define sugar/test txexpr/base racket/match sugar/unstable/container sugar/coerce sugar/unstable/len  "../private/whitespace.rkt")
 
 (provide whitespace? whitespace/nbsp?)