diff --git a/pollen/private/main-base.rkt b/pollen/private/main-base.rkt index 1bc3085..390524f 100644 --- a/pollen/private/main-base.rkt +++ b/pollen/private/main-base.rkt @@ -18,9 +18,9 @@ (define ((make-parse-proc parser-mode root-proc) xs) (define (stringify xs) (apply string-append (map to-string xs))) (match parser-mode - [(== default-mode-pagetree) (decode-pagetree xs)] - [(== default-mode-markup) (apply root-proc (remove-voids xs))] - [(== default-mode-markdown) + [(== default-mode-pagetree eq?) (decode-pagetree xs)] + [(== default-mode-markup eq?) (apply root-proc (remove-voids xs))] + [(== default-mode-markdown eq?) (let* ([xs (stringify xs)] [xs ((dynamic-require 'markdown 'parse-markdown) xs)] [xs (map strip-empty-attrs xs)]) diff --git a/pollen/private/reader-base.rkt b/pollen/private/reader-base.rkt index bf1882c..b1adb1a 100644 --- a/pollen/private/reader-base.rkt +++ b/pollen/private/reader-base.rkt @@ -20,11 +20,11 @@ (define (infer-parser-mode reader-mode reader-here-path) (match reader-mode - [(== default-mode-auto) + [(== default-mode-auto eq?) (match (cond [(get-ext reader-here-path) => string->symbol]) - [(== (setup:pagetree-source-ext)) default-mode-pagetree] - [(== (setup:markup-source-ext)) default-mode-markup] - [(== (setup:markdown-source-ext)) default-mode-markdown] + [(== (setup:pagetree-source-ext) eq?) default-mode-pagetree] + [(== (setup:markup-source-ext) eq?) default-mode-markup] + [(== (setup:markdown-source-ext) eq?) default-mode-markdown] [_ default-mode-preproc])] [_ reader-mode])) @@ -115,11 +115,11 @@ [(drracket:default-extension) (symbol->string (match mode - [(== default-mode-auto) (setup:preproc-source-ext)] - [(== default-mode-preproc) (setup:preproc-source-ext)] - [(== default-mode-markdown) (setup:markdown-source-ext)] - [(== default-mode-markup) (setup:markup-source-ext)] - [(== default-mode-pagetree) (setup:pagetree-source-ext)]))] + [(== default-mode-auto eq?) (setup:preproc-source-ext)] + [(== default-mode-preproc eq?) (setup:preproc-source-ext)] + [(== default-mode-markdown eq?) (setup:markdown-source-ext)] + [(== default-mode-markup eq?) (setup:markup-source-ext)] + [(== default-mode-pagetree eq?) (setup:pagetree-source-ext)]))] [else default]))) (define-syntax-rule (reader-module-begin mode . _) diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 8bf48ef..40db9c0 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1578803070 +1578804970