aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2024-01-05 21:21:24 +0100
committerJoris2024-01-05 21:21:24 +0100
commit43b46b17fc1d12170549702206bc0060f5f8c265 (patch)
treeb2e46cb5ca1dc26f721081ab0a3153514217213e
parent0d97631eb0c8b1459a23e8e003705502754969d1 (diff)
downloadmusic-43b46b17fc1d12170549702206bc0060f5f8c265.tar.gz
music-43b46b17fc1d12170549702206bc0060f5f8c265.tar.bz2
music-43b46b17fc1d12170549702206bc0060f5f8c265.zip
Add Here’s to you Nicola and Bart from Joan Baez
-rw-r--r--public/rhythms/1.pngbin0 -> 6494 bytes
-rw-r--r--songs/joan-baez/here-s-to-you-nicola-and-bart.lisp16
-rw-r--r--src/main.lisp2
3 files changed, 17 insertions, 1 deletions
diff --git a/public/rhythms/1.png b/public/rhythms/1.png
new file mode 100644
index 0000000..d137d4f
--- /dev/null
+++ b/public/rhythms/1.png
Binary files differ
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
new file mode 100644
index 0000000..9fc9ade
--- /dev/null
+++ b/songs/joan-baez/here-s-to-you-nicola-and-bart.lisp
@@ -0,0 +1,16 @@
+(song
+ (title "Here’s to you, Nicola and Bart")
+ (from "Joan Baez")
+ (tonality "C")
+
+ (chords
+ (all
+ ((C G) ("Am" G) (C G) ("Am" G))
+ (("Em" "Dm7") (G7 C) (C "Dm7") ((E4 1) (E7 1) ("Am" 2)))))
+
+ (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!")))
diff --git a/src/main.lisp b/src/main.lisp
index 2d3007e..51a7cbb 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -151,7 +151,7 @@
(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))))