move append-block-tag function

decode.rkt

@@ -1,12 +1,21 @@
 #lang racket/base
 (require racket/contract)
 (require (only-in xml xexpr/c))
-(require "tools.rkt")
+(require "tools.rkt" "predicates.rkt")
 
 (module+ test (require rackunit))
 
 (provide (all-defined-out))
 
+;; add a block tag to the list
+;; this function is among the predicates because it alters a predicate globally.
+(define/contract (register-block-tag tag)
+  (symbol? . -> . void?)
+  (append-block-tag tag))
+
+(module+ test
+    (check-true (begin (register-block-tag 'barfoo) (block-xexpr? '(barfoo "foo")))))
+
 
 ;; decoder wireframe
 (define/contract (decode nx

library/decode-tools.rkt

@@ -248,7 +248,7 @@
 
 (module+ test
   (check-equal? (wrap-paragraph '("foo" "bar")) '(p "foo" "bar"))
-  (check-equal? (begin (register-block-tag 'para) (wrap-paragraph #:tag 'para '("foo" "bar"))) 
+  (check-equal? (begin (append-block-tag 'para) (wrap-paragraph #:tag 'para '("foo" "bar"))) 
                 '(para "foo" "bar"))
   (check-equal? (wrap-paragraph '((p "bar" "foo"))) '(p "bar" "foo"))
   (check-equal? (wrap-paragraph '((div "bar" "foo") "Hi" )) '(p (div "bar" "foo") "Hi")))

predicates.rkt

@@ -10,29 +10,6 @@
          (all-from-out "file-tools.rkt"))
 
 
-;; add a block tag to the list
-;; this function is among the predicates because it alters a predicate globally.
-(define/contract (register-block-tag tag)
-  (symbol? . -> . void?)
-  (set! block-tags (cons tag block-tags)))
-
-;; initial set of block tags: from html
-(define block-tags html:block-tags)
-
-
-;; is the tagged-xexpr a block element (as opposed to inline)
-;; tags are inline unless they're registered as block tags.
-(define/contract (block-xexpr? x)
-  (any/c . -> . boolean?)
-  ((tagged-xexpr? x) . and . (->boolean ((car x) . in? . block-tags))))
-
-(module+ test
-  (check-true (block-xexpr? '(p "foo")))
-  (check-true (block-xexpr? '(div "foo")))
-  (check-false (block-xexpr? '(em "foo")))
-  (check-false (block-xexpr? '(barfoo "foo")))
-  (check-true (begin (register-block-tag 'barfoo) (block-xexpr? '(barfoo "foo")))))
-
 
 ;; is it an xexpr tag?
 (define/contract (xexpr-tag? x)
@@ -121,6 +98,27 @@
   (check-false (meta-xexpr? '(meta))))
 
 
+;; initial set of block tags: from html
+(define block-tags html:block-tags)
+
+(define/contract (append-block-tag tag)
+  (xexpr-tag? . -> . void?)
+  (set! block-tags (cons tag block-tags)))
+
+;; is the tagged-xexpr a block element (as opposed to inline)
+;; tags are inline unless they're registered as block tags.
+(define/contract (block-xexpr? x)
+  (any/c . -> . boolean?)
+  ;; (car x) = shorthand for tag of xexpr
+  ((tagged-xexpr? x) . and . ((car x) . in? . block-tags)))
+
+(module+ test
+  (check-true (block-xexpr? '(p "foo")))
+  (check-true (block-xexpr? '(div "foo")))
+  (check-false (block-xexpr? '(em "foo")))
+  (check-false (block-xexpr? '(barfoo "foo"))))
+
+
 ;; count incidence of elements in a list
 ;; returns hash where key is element, value is incidence
 ;; todo: move this? Ideally it would be in tools,

render.rkt

@@ -287,6 +287,7 @@
     (when (file-exists? tp) (delete-file tp))))
 
 ;; cache some modules inside this namespace so they can be shared by namespace for eval
+;; todo: macrofy this to avoid repeating names
 (require web-server/templates  
          racket/list
          xml/path