diff --git a/decode/typography.rkt b/decode/typography.rkt index e11f9eb..4c309f8 100644 --- a/decode/typography.rkt +++ b/decode/typography.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/match xml) -(require "../tools.rkt" "block.rkt" "../world.rkt" sugar txexpr) +(require racket/list racket/match xml) +(require "block.rkt" "../world.rkt" sugar txexpr) (define (make-replacer query+replacement) diff --git a/pagetree.rkt b/pagetree.rkt index 064c49f..4fc3052 100644 --- a/pagetree.rkt +++ b/pagetree.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/path) -(require "tools.rkt" "world.rkt" "decode.rkt" sugar txexpr "cache.rkt") +(require racket/path racket/list) +(require "file.rkt" "world.rkt" "decode.rkt" sugar txexpr "cache.rkt") (define+provide current-pagetree (make-parameter #f)) diff --git a/render.rkt b/render.rkt index 2096bb2..9fe19f2 100644 --- a/render.rkt +++ b/render.rkt @@ -229,7 +229,6 @@ sugar txexpr pollen/template - pollen/tools pollen/world pollen/project-requires) (define-namespace-anchor my-module-cache-ns-anchor) @@ -262,7 +261,6 @@ sugar txexpr pollen/template - pollen/tools pollen/world pollen/project-requires)) (string->bytes/utf-8 (eval expr-to-eval (current-namespace))))) \ No newline at end of file diff --git a/template.rkt b/template.rkt index ba95a4c..4025c26 100644 --- a/template.rkt +++ b/template.rkt @@ -1,7 +1,7 @@ #lang racket/base (require (for-syntax racket/base)) (require racket/string xml xml/path sugar/define sugar/container sugar/coerce/contract) -(require "tools.rkt" txexpr "world.rkt" "cache.rkt" "pagetree.rkt") +(require "file.rkt" txexpr "world.rkt" "cache.rkt" "pagetree.rkt") (require sugar/coerce/value) diff --git a/tools.rkt b/tools.rkt deleted file mode 100644 index 764e218..0000000 --- a/tools.rkt +++ /dev/null @@ -1,10 +0,0 @@ -#lang racket/base -(require racket/list "debug.rkt" "file.rkt") -(provide (all-defined-out) - (all-from-out racket/list "debug.rkt" "file.rkt")) - - -(require xml racket/string) - -(define (html->xexpr . xs) - (string->xexpr (string-join xs "")))