From 2e6f266948bda4d4b08c9b88e14eeaeb284f137a Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 4 Jan 2024 21:03:03 +0100
Subject: Specify chord duration

---
 songs/bob-marley/no-woman-no-cry.lisp | 89 +++++++++++++++++++++++++++++++++++
 songs/bob-marley/woman-no-cry.lisp    | 73 ----------------------------
 2 files changed, 89 insertions(+), 73 deletions(-)
 create mode 100644 songs/bob-marley/no-woman-no-cry.lisp
 delete mode 100644 songs/bob-marley/woman-no-cry.lisp

(limited to 'songs')

diff --git a/songs/bob-marley/no-woman-no-cry.lisp b/songs/bob-marley/no-woman-no-cry.lisp
new file mode 100644
index 0000000..deaaa80
--- /dev/null
+++ b/songs/bob-marley/no-woman-no-cry.lisp
@@ -0,0 +1,89 @@
+(song
+    (title "No Woman, No Cry")
+    (from "Bob Marley & The Wailers")
+    (tonality "C")
+
+    ; (chords
+    ;     (:templates
+    ;       (A ((C G) (("Am" 1.5) (F 0.5 2)) ((C 2) (F 1.5) (C 0.5)) (C G)))
+    ;       (B ((C G) (("Am" 1.5) (F 0.5 2)) (C G) (("Am" 1.5) (F 0.5 2))))
+    ;       (C ((C G) ("Am" F) (C G) ("Am" F))))
+
+    ;     (intro A)
+    ;     (chorus A A)
+    ;     (verse B B)
+    ;     (bridge C C))
+
+    (chords
+        (intro
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            (((C 2) (F 1.5) (C 0.5)) (C G)))
+
+        (chorus
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            (((C 2) (F 1.5) (C 0.5)) (C G))
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            (((C 2) (F 1.5) (C 0.5)) (C G)))
+
+        (verse
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            ((C G) (("Am" 1.5) (F 0.5 2)))
+            ((C G) (("Am" 1.5) (F 0.5 2))))
+
+        (bridge
+            ((C G) ("Am" F) (C G) ("Am" F))
+            ((C G) ("Am" F) (C G) ("Am" F))))
+
+    (lyrics
+        (intro)
+
+        (chorus
+            "No woman no cry,
+            No woman no cry.
+            No woman no cry,
+            No woman no cry.")
+
+        (verse
+            "Say I remember, when we used to sit,
+            In the government yard in Trenchtown.
+            Observing the hypocrites,
+            As they would, mingle with the good people we met.
+            Good friends we had, and good friends we lost,
+            Along the way.
+            In this bright future, you can forget your past,
+            So dry your tears I say And,")
+
+        (chorus
+            "No woman no cry,
+            No woman no cry.
+            Hey little darling, don’t shed no tears,
+            No woman no cry.")
+
+        (verse
+            "Say I remember, when we used to sit,
+            In the government yard in Trenchtown.
+            And then Georgie, would make a fire light,
+            As it was, love wood burning through the night.
+            And we would cook, wholemeal porridge,
+            Of which I’ll share with you.
+            My feet is my only carriage,
+            So I’ve got to push on through, but while I’m gone I mean.")
+
+        (bridge
+            "Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright,
+            Everything’s going to be alright.")
+
+        (chorus
+            "So woman no cry,
+            No woman no cry.
+            Oh my little sister, don’t shed no tears,
+            No woman no cry.")
+
+        (outro)))
diff --git a/songs/bob-marley/woman-no-cry.lisp b/songs/bob-marley/woman-no-cry.lisp
deleted file mode 100644
index 57ba345..0000000
--- a/songs/bob-marley/woman-no-cry.lisp
+++ /dev/null
@@ -1,73 +0,0 @@
-(song
-    (title "No Woman, No Cry")
-    (from "Bob Marley & The Wailers")
-    (tonality "C")
-
-    (chords
-        (intro
-            ((C G) ("Am *" F) (C "F *") (C G)))
-
-        (chorus
-            ((C G) ("Am *" F) (C "F *") (C G))
-            ((C G) ("Am *" F) (C "F *") (C G)))
-
-        (verse
-            ((C G) ("Am *" F) (C G) ("Am *" F))
-            ((C G) ("Am *" F) (C G) ("Am *" F)))
-
-        (bridge
-            ((C G) ("Am" F) (C G) ("Am" F))
-            ((C G) ("Am" F) (C G) ("Am" F))))
-
-    (lyrics
-        (intro)
-
-        (chorus
-            "No woman no cry,
-            No woman no cry.
-            No woman no cry,
-            No woman no cry.")
-
-        (verse
-            "Say I remember, when we used to sit,
-            In the government yard in Trenchtown.
-            Observing the hypocrites,
-            As they would, mingle with the good people we met.
-            Good friends we had, and good friends we lost,
-            Along the way.
-            In this bright future, you can forget your past,
-            So dry your tears I say And,")
-
-        (chorus
-            "No woman no cry,
-            No woman no cry.
-            Hey little darling, don’t shed no tears,
-            No woman no cry.")
-
-        (verse
-            "Say I remember, when we used to sit,
-            In the government yard in Trenchtown.
-            And then Georgie, would make a fire light,
-            As it was, love wood burning through the night.
-            And we would cook, wholemeal porridge,
-            Of which I’ll share with you.
-            My feet is my only carriage,
-            So I’ve got to push on through, but while I’m gone I mean.")
-
-        (bridge
-            "Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright,
-            Everything’s going to be alright.")
-
-        (chorus
-            "So woman no cry,
-            No woman no cry.
-            Oh my little sister, don’t shed no tears,
-            No woman no cry.")
-
-        (outro)))
-- 
cgit v1.2.3