aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--public/main.css6
-rw-r--r--songs/scorpions/wind-of-change.lisp93
-rw-r--r--songs/shania-twain/you-re-the-one.lisp7
-rw-r--r--src/main.lisp10
5 files changed, 114 insertions, 4 deletions
diff --git a/README.md b/README.md
index b7a9b4c..0a45eaa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Music
-Available at [https://music.guyonvarch.me](https://music.guyonvarch.me).
+Available at [https://music.jorisg.fr](https://music.jorisg.fr).
## Getting started
diff --git a/public/main.css b/public/main.css
index 55c298c..52b2460 100644
--- a/public/main.css
+++ b/public/main.css
@@ -41,6 +41,12 @@ body {
font-style: italic;
}
+.g-Notes {
+ background-color: #eee;
+ padding: 1rem;
+ border-radius: 0.25rem;
+}
+
/* Parts */
.g-Parts {
diff --git a/songs/scorpions/wind-of-change.lisp b/songs/scorpions/wind-of-change.lisp
new file mode 100644
index 0000000..e99a191
--- /dev/null
+++ b/songs/scorpions/wind-of-change.lisp
@@ -0,0 +1,93 @@
+(song
+ (title "Wind Of Change")
+ (from "Scorpions")
+ (tonality "C")
+
+ (notes
+ "ℹ️ Il y a parfois des pauses entre les parties.")
+
+ (chords
+ ("Intro / Sifflements"
+ (F "Dₘ" F "Dₘ")
+ ("Aₘ" ("Dₘ" "Aₘ") ((G 2))))
+
+ (verse
+ :repeat 2
+ (C "Dₘ" C ("Dₘ" "Aₘ"))
+ (((G 2))))
+
+ (chorus
+ ((C G) ("Dₘ" G) (C G) ("Dₘ" G))
+ (("Aₘ" F) G))
+
+ (bridge
+ ("Aₘ" G "Aₘ" G)
+ (C "Dₘ" E))
+
+ (solo
+ ((F G) ("Eₘ" "Aₘ") (F G) "Aₘ")
+ ((F G) ("Eₘ" "Aₘ") "Dₘ" E))
+
+ (outro
+ (F "Dₘ" F "Dₘ")
+ ("Aₘ" "Dₘ"))
+ )
+
+ (lyrics
+ (intro)
+
+ (verse
+ "I follow the Moskva,
+ Down to Gorky Park,
+ Listening to the wind, of change.
+ August summer night,
+ Soldiers passing by,
+ Listening to the wind, of change.")
+
+ ("Sifflements")
+
+ (verse
+ "The world is closing in,
+ And did you ever think,
+ That we could be so close, like brothers.
+ The future’s in the air,
+ I can feel it everywhere,
+ Blowing with the wind, of change.")
+
+ (chorus
+ "Take me, to the magic of the moment,
+ On a glory night,
+ Where the children of tomorrow, dream away,
+ In the wind of change.")
+
+ (verse
+ "Walking down the street,
+ And distant memories,
+ Are buried in the past, forever.
+ I follow the Moskva,
+ And down to Gorky Park,
+ Listening to the wind, of change.")
+
+ (chorus
+ "Take me, to the magic of the moment,
+ On a glory night,
+ Where the children of tomorrow, dream away,
+ In the wind of change.")
+
+ (bridge
+ "The wind of change blows straight,
+ Into the face of time.
+ Like a storm wind that will ring,
+ The freedom bell, for peace of mind,
+ Let your balalaika sing,
+ What my guitar, wants to say.")
+
+ (solo)
+
+ (chorus
+ "Take me, to the magic of the moment,
+ On a glory night,
+ Where the children of tomorrow, dream away,
+ In the wind of change.")
+
+ (outro)))
diff --git a/songs/shania-twain/you-re-the-one.lisp b/songs/shania-twain/you-re-the-one.lisp
index 67a4b9f..e8f4d8e 100644
--- a/songs/shania-twain/you-re-the-one.lisp
+++ b/songs/shania-twain/you-re-the-one.lisp
@@ -5,18 +5,19 @@
(chords
("Intro / Outro"
- ("E♭" ("A♭" "B♭")))
+ (("E♭" "E♭/G") ("A♭" "B♭")))
(verse
:repeat 3
- ("E♭" ("A♭" "B♭")))
+ (("E♭" "E♭/G") ("A♭" "B♭")))
(pre-chorus
:repeat 2
(("E♭" "A♭") "B♭"))
(chorus
- :repeat 2
+ (("E♭" "A♭") ("Fₘ" "B♭"))
+ (("E♭" "A♭") ("B♭" "A♭"))
(("E♭" "A♭") ("Fₘ" "B♭"))
(("E♭" "A♭") "B♭"))
diff --git a/src/main.lisp b/src/main.lisp
index 70b1bab..be2491a 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -53,6 +53,14 @@
(h "h1" '(("class" "g-Title")) (list title))
(h "div" '(("class" "g-Author")) (list from)))))
+; Notes
+
+(defun notes-tags (notes)
+ (if
+ (eql notes nil)
+ nil
+ (h "div" '(("class" "g-Notes")) (list notes))))
+
; Part
(defun part-name (key)
@@ -178,6 +186,7 @@
(title (car (song-key 'title (cdr data))))
(from (car (song-key 'from (cdr data))))
(tonality (car (song-key 'tonality (cdr data))))
+ (notes (car (song-key 'notes (cdr data))))
(chords (song-key 'chords (cdr data)))
(lyrics (song-key 'lyrics (cdr data))))
(write-file output (page
@@ -188,6 +197,7 @@
(list
(h "a" '(("class" "g-Back") ("href" "/")) '("Retour à l’accueil"))
(title-tags title from)
+ (notes-tags notes)
(chord-tags chords tonality)
(lyrics-tags lyrics)))))))