From de1e7248975f8eb086ee517b3ad8b8ff5aac5b60 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Tue, 30 Oct 2018 14:23:30 -0700 Subject: [PATCH] unstick --- pollen/private/cache-utils.rkt | 3 +-- pollen/render.rkt | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pollen/private/cache-utils.rkt b/pollen/private/cache-utils.rkt index 16e5387..c5cd635 100644 --- a/pollen/private/cache-utils.rkt +++ b/pollen/private/cache-utils.rkt @@ -62,8 +62,7 @@ (parameterize ([current-namespace (make-base-namespace)] [current-directory (dirname path)]) (namespace-attach-module - (namespace-anchor->namespace cache-utils-module-ns) - 'pollen/setup (current-namespace)) ; brings in currently instantiated params (unlike namespace-require) + (namespace-anchor->namespace cache-utils-module-ns) 'pollen/setup) ; brings in currently instantiated params (unlike namespace-require) (define doc-missing-thunk (λ () "")) (define metas-missing-thunk (λ () (hasheq))) (list doc-key (dynamic-require path doc-key doc-missing-thunk) diff --git a/pollen/render.rkt b/pollen/render.rkt index 6530a79..ea2f100 100644 --- a/pollen/render.rkt +++ b/pollen/render.rkt @@ -175,8 +175,8 @@ (parameterize ([current-namespace (make-base-namespace)] [current-directory (->complete-path source-dir)]) (define ns (namespace-anchor->namespace render-module-ns)) - (namespace-attach-module ns 'scribble/core (current-namespace)) - (namespace-attach-module ns 'scribble/manual (current-namespace)) + (namespace-attach-module ns 'scribble/core) + (namespace-attach-module ns 'scribble/manual) ;; scribble/lp files have their doc export in a 'doc submodule, so check both locations (match (cond [(dynamic-require source-path 'doc (λ () #false))] @@ -298,6 +298,5 @@ ;; render a datum, not a syntax object, so that it can have fresh bindings. (parameterize ([current-namespace (make-base-namespace)] [current-output-port (current-error-port)]) - (namespace-attach-module (namespace-anchor->namespace render-module-ns) - 'pollen/setup (current-namespace)) ; brings in params + (namespace-attach-module (namespace-anchor->namespace render-module-ns) 'pollen/setup) ; brings in params (eval datum-to-eval)))