Use new skribe reader in haunt.

1 files changed, 4 insertions, 14 deletions

diff --git a/haunt.scm b/haunt.scm
index 157935b..b2dd1e0 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -4,8 +4,8 @@
              (srfi srfi-26) ; cut
              (ice-9 ftw)    ; file system
              (ice-9 match)  ; match-lambda
-             (skribe)
              (haunt reader)
+             (haunt reader skribe)
              (haunt site)
              (haunt asset)
              (haunt post) ;post-file-name
@@ -17,19 +17,9 @@
 
 
 (define skribe-reader
-  (make-reader (make-file-extension-matcher "skr")
-               (lambda (file-name)
-                 (let ((contents (load (absolute-file-name file-name) %skribe-reader)))
-                   (values meta contents)))))
-
-;; Create stubs for each sxml tag
-;; This is needed for the skribe to sxml conversion.
-(for-each
- (lambda (tag)
-   (eval `(define (,tag . content)
-            (list (quote ,tag) content))
-         (current-module)))
- '(a blockquote p img h1 h2 h3 code pre strong em ul li dl dt dd))
+  (make-skribe-reader #:modules '((haunt skribe utils)
+                                  (haunt utils)
+                                  (skribe-utils))))
 
 
 (define (photo-snippet post)