From 8ad4eb11809e6cb24d43ca7af491a8cb7a3fdadd Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Mon, 29 Oct 2018 17:13:04 -0700
Subject: [PATCH] runtime-config

---
 pollen/private/runtime-config.rkt | 50 ++++++++++++++++++-------------
 pollen/private/ts.rktd            |  2 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/pollen/private/runtime-config.rkt b/pollen/private/runtime-config.rkt
index 8170e38..f399b26 100644
--- a/pollen/private/runtime-config.rkt
+++ b/pollen/private/runtime-config.rkt
@@ -1,35 +1,43 @@
 #lang racket/base
-(require pollen/setup scribble/reader racket/pretty version/utils racket/port racket/string)  
-(provide (all-defined-out))
+(require pollen/setup
+         scribble/reader
+         racket/pretty
+         version/utils
+         racket/port
+         racket/string
+         txexpr/base)
+
+(provide show configure current-top-path)
 
 (define current-top-path (make-parameter #f))
 
+(define (my-pretty-print x)
+  ;; #:newline option for `pretty-print` was introduced in 6.6.0.3
+  (if (version<? (version) "6.7")
+      ;; so trim trailing newline manually in earlier versions
+      (display (string-trim #:left? #f (with-output-to-string (λ () (pretty-print x))) "\n"))
+      (pretty-print #:newline? #f x)))
+
+(define (my-error-handler exn)
+  (error '|pollen markup error| (string-join (cdr (string-split (exn-message exn) ": ")) ": ")))
+
 (define (show doc parser-mode here-path)
   ;; we only want the top doc to print in the runtime environment
   ;; otherwise if a Pollen source imports others, they will all print their docs in sequence.
   ;; so only print if the current here-path is the top path, which is stored in the `current-top-path` parameter.
-  (let ([ctp (current-top-path)])
-    (when (and ctp (equal? here-path ctp))
-      (if (memq parser-mode (list default-mode-preproc default-mode-template))
-          (display doc)
-          ;; #:newline option for `pretty-print` was introduced in 6.6.0.3,
-          ;; so trim trailing newline manually
-          (let ([pretty-print-proc (if (version<? (version) "6.7")
-                                       (λ (x) (display (string-trim #:left? #f (with-output-to-string (λ () (pretty-print x))) "\n")))
-                                       (λ (x) (pretty-print #:newline? #f x)))])
-            ;; OK to use dynamic-require because runtime-config itself is dynamic-required
-            (pretty-print-proc (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/base 'validate-txexpr) doc))))))))
+  (when (equal? here-path (current-top-path))
+    (if (memq parser-mode (list default-mode-preproc default-mode-template))
+        (display doc)
+        (with-handlers ([exn:fail? my-error-handler])
+          (my-pretty-print (validate-txexpr doc))))))
 
 (define (configure top-here-path)
-  (current-top-path top-here-path)  ;; puts `show` into the right mode
-
-  ;; wrap REPL interactions with pollen expression support
+  (current-top-path top-here-path) ; puts `show` into the right mode
   (define old-read (current-read-interaction))
-  (define pollen-readtable (make-at-readtable #:command-char (setup:command-char)))
-  (define (new-read src in)
+  (define (pollen-repl-read src in)
+    ;; wrap repl interactions with pollen expression support
+    (define pollen-readtable (make-at-readtable #:command-char (setup:command-char)))
     (parameterize ([current-readtable pollen-readtable])
       (old-read src in)))
-  (current-read-interaction new-read))
+  (current-read-interaction pollen-repl-read))
 
diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd
index 6e391b1..c83c83e 100644
--- a/pollen/private/ts.rktd
+++ b/pollen/private/ts.rktd
@@ -1 +1 @@
-1540858381
+1540858384