diff --git a/src/elements.lisp b/src/elements.lisp index e9c3d8f..b9cad5d 100644 --- a/src/elements.lisp +++ b/src/elements.lisp @@ -58,7 +58,7 @@ :accessor element-prefix))) (defclass user-element (element) - ((expand-to :initarg :expander + ((expand-to :initarg :expander :accessor user-element-expander))) (defclass fragment (element) ()) @@ -228,11 +228,10 @@ (list prop `(attr attrs (make-keyword ',prop)))) props) (let ((props - (loop :for (key . value) in (attrs-alist attrs) - :unless (member key - ',(mapcar #'make-keyword - props)) - :append (list key value)))) + (loop + :for (key . value) in (attrs-alist attrs) + :unless (member key ',(mapcar #'make-keyword props)) + :append (list key value)))) (declare (ignorable props)) (progn ,@body)))))))) (defmacro ,name (&body attrs-and-children) diff --git a/src/escape.lisp b/src/escape.lisp index 4044f5e..cd5d98d 100644 --- a/src/escape.lisp +++ b/src/escape.lisp @@ -32,14 +32,12 @@ (with-output-to-string (s) (loop :for c :across string - :do (write (escape-char c escape-map) - :stream s :escape nil))) + :do (write (escape-char c escape-map) :stream s :escape nil))) string)) (defun escape-attrs-alist (alist) (mapcar (lambda (kv) - (cons (car kv) - (escape-string (cdr kv) *attr-escape-map*))) + (cons (car kv) (escape-string (cdr kv) *attr-escape-map*))) alist)) (defun escape-children (children)