diff options
| -rw-r--r-- | songs/joan-baez/here-s-to-you-nicola-and-bart.lisp | 6 | ||||
| -rw-r--r-- | src/main.lisp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/songs/joan-baez/here-s-to-you-nicola-and-bart.lisp b/songs/joan-baez/here-s-to-you-nicola-and-bart.lisp index 34acba3..4034dae 100644 --- a/songs/joan-baez/here-s-to-you-nicola-and-bart.lisp +++ b/songs/joan-baez/here-s-to-you-nicola-and-bart.lisp @@ -13,6 +13,6 @@ (lyrics (all "Here’s, to you, Nicola and Bart. - Rest, fore-ver here in our hearts. - The last, and fi-nal moment is yours. - That a-gony, is your triumph!"))) + Rest, fore–ver here in our hearts. + The last, and fi–nal moment is yours. + That a–gony, is your triumph!"))) diff --git a/src/main.lisp b/src/main.lisp index 33c75b4..913ae97 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -30,7 +30,7 @@ ; HTML (defun page (title body) - (format + (format nil "<!doctype html><html lang=\"fr\"><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width\"><title>~A</title><link rel=\"stylesheet\" href=\"/main.css\"><link rel=\"icon\" href=\"/icon.png\">~A<script src=\"/main.js\"></script>" title @@ -67,7 +67,7 @@ (otherwise key))) (defun part-tags (key children) - (h "div" + (h "div" '(("class" "g-Part")) (list (if @@ -115,7 +115,7 @@ (let* ((is-repeat (eql (car x) :repeat)) (n (if is-repeat (second x) 1)) (rows (if is-repeat (cddr x) x))) - (part-tags + (part-tags key (h "div" @@ -153,13 +153,13 @@ (if (member c cs) (h "emph" nil (list (make-string 1 :initial-element c))) (make-string 1 :initial-element c))))) (defun lyrics-line (line) - (h "div" nil (list (emph line (list #\, #\. #\? #\! #\-))))) + (h "div" nil (list (emph line (list #\, #\. #\? #\! #\–))))) (defun lyrics-section (s) (let ((p (car (cdr s)))) - (part-tags + (part-tags (car s) - (if p + (if p (h "div" '(("class" "g-Lyrics__Paragraph")) (mapcar #'lyrics-line (lines p))) nil)))) @@ -203,7 +203,7 @@ (list (h "h1" '(("class" "g-Title")) '("Music")) (h "ul" '(("class" "g-Songs")) - (mapcar + (mapcar (lambda (path) (let* ((data (with-open-file (in path) (read in))) (href (concatenate 'string (car (split path #\.)) ".html")) |