5 files changed, 70 insertions, 6 deletions

@@ -1,4 +1,5 @@
 chicken-scratch
+scratchdown
 *.link
 *.so
 *.o
@@ -27,8 +27,7 @@
 (module chicken-scratch
     (expand-string
      expand-port
-     def
-     %def/replacer)
+     def %def/replacer)
 
   (import scheme
           (chicken base)
@@ -50,13 +49,16 @@
       (let* ((delim (random-string-not-in str))
              (template (make-concatenated-port
                         (open-input-string (string-append "#<#" delim "\n"))
-                        (open-input-string (irregex-replace "^#!.*\n" str ""))
+                        (open-input-string "#(import chicken-scratch)")
+                        (open-input-string str)
                         (open-input-string (string-append "\n" delim "\n"))))
              (expanded (open-output-string))
              (output (begin
                        (display (eval (read template)) expanded)
                        (get-output-string expanded))))
-        (irregex-replace/all `(seq ,(%def/replacer) (* "\n"))
+        (irregex-replace/all `(: (or "#<unspecified>"
+                                     ,(%def/replacer))
+                                 (* whitespace))
                              output
                              ""))))
 
@@ -11,6 +11,8 @@ License: BSD-3.  See COPYING for details.
         (chicken process-context))
 
 (define (main args)
+  ;; XXX: handle standard input piping
+  ;; XXX: Must have an #(import chicken-scratch at the beginning)
   (for-each (lambda (file)
               (when (file-exists? file)
                 (display (with-input-from-file file expand-port))
@@ -9,9 +9,12 @@ SOURCES = chicken-scratch.scm chicken-scratch.mod.scm
 chicken-scratch: $(SOURCES)
         chicken-install -n
 
+scratchdown: scratchdown.scm chicken-scratch
+        csc $<
+
 .PHONY: install
-install: chicken-scratch
-        install -Dt $(PREFIX)/bin $<
+install: chicken-scratch scratchdown
+        install -Dt $(PREFIX)/bin $^
 
 .PHONY: chicken-install
 chicken-install: chicken-scratch
@@ -20,3 +23,4 @@ chicken-install: chicken-scratch
 .PHONY: clean
 clean:
         rm -f *.link *.so *.o *.build.sh *.import.scm *.install.sh
+        rm -f chicken-scratch scratchdown
@@ -0,0 +1,55 @@
+#!/bin/sh
+#| -*- scheme -*-
+exec csi -s "$0" "$@"
+SCRATCHDOWN --- Combine markdown and chicken-scratch
+|#
+
+(import (chicken io)
+        (chicken irregex)
+        (chicken process-context)
+        (chicken-scratch)
+        (html-parser)
+        (lowdown)
+        (sxml-transforms)
+        (utf8))
+
+(define (expand* text)
+  (expand-string
+   (irregex-replace/all '(or (: #\# #\# (look-ahead (or #\{ #\()))
+                             (: #\# (look-ahead (~ #\{ #\()))
+                             (: #\# eos))
+                        text
+                        "##")))
+
+#;(define (list-of-strings? xs)
+  (cond
+   ((null? xs) #t)
+   ((not (string? (car xs))) #f)
+   (else (list-of-strings? (cdr xs)))))
+
+#;(define (expand-text x)
+  (print x)
+  (cond
+   ((symbol? x) x)
+   ((string? x)
+    (expand* x))
+   ((list-of-strings? x)
+    (expand* (apply string-append x)))
+   ((list-of-strings? (cdr x))
+    (cons (car x)
+          (expand-text (cdr x))))
+   ((list? x)
+    (map expand-text x))
+   (else x)))
+
+(define (read-and-expand file)
+  (let* ((text (with-input-from-file file read-string))
+         (expd (irregex-replace "^#!.*\n" (expand* text) ""))
+         #;(sexp (markdown->sxml expd))
+         )
+    (markdown->html expd)))
+
+(define (main args)
+  (for-each read-and-expand args))
+
+(main (command-line-arguments))