Allow to specify chord multiplier

3 files changed, 61 insertions, 32 deletions

diff --git a/public/main.css b/public/main.css
index 8606108..06ad2b4 100644
--- a/public/main.css
+++ b/public/main.css
@@ -17,12 +17,14 @@ body {
     margin: 0;
 }
 
-/* Song */
+/* Back button */
 
 .g-Back {
     margin-bottom: 0;
 }
 
+/* Title */
+
 .g-Title {
     margin-top: 0;
     margin-bottom: 0.5rem;
@@ -39,6 +41,8 @@ body {
     font-style: italic;
 }
 
+/* Parts */
+
 .g-Parts {
     display: flex;
     flex-direction: column;
@@ -51,7 +55,7 @@ body {
     gap: 0.5rem;
 }
 
-.g-Part h3 {
+.g-Part__Title {
     margin: 0;
     padding: 0 0.25rem;
     border-radius: 0.25rem;
@@ -61,23 +65,36 @@ body {
     color: #851616;
     border: 1px solid #851616;
     width: fit-content;
+    padding: 0.25rem;
 }
 
+/* Chords */
+
 .g-Chords__Tonality {
     display: flex;
     align-items: center;
     gap: 0.5rem;
+    height: 1.5rem;
+}
+
+.g-Chords__Section {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 0.5rem;
 }
 
 .g-Chords__Table {
     border-collapse: collapse;
+    margin-top: 0.5rem;
+    width: 100%;
 }
 
 .g-Chords__Cell {
     width: 4rem;
     text-align: center;
-    border-left: 1px solid black;
-    border-right: 1px solid black;
+    border-left: 0.25rem solid #333;
+    border-right: 0.25rem solid #333;
     padding: 0.5rem 1rem;
     white-space: nowrap;
 }
@@ -93,12 +110,28 @@ body {
 }
 
 .g-Chords__Chord:not(:last-child):after {
-    display: inline-block;
-    content: "/";
+    display: block;
+    content: "";
     margin-left: 0.5rem;
     margin-right: 1rem;
+    background-color: #88b57e;
+    width: 0.25rem;
+    height: 0.8em;
+    transform: rotate(20deg);
+}
+
+.g-Chords__Multiplier {
+    font-weight: bold;
+    border-bottom: 0.125rem solid #181a87;
+    color: #181a87;
 }
 
+.g-Chords__Multiplier::before {
+    content: "× ";
+}
+
+/* Lyrics */
+
 .g-Lyrics__Paragraph {
     display: flex;
     flex-direction: column;
@@ -106,5 +139,6 @@ body {
 }
 
 .g-Lyrics__Paragraph emph {
-    background-color: #a7de9b;
+    background-color: #88b57e;
+    color: white;
 }
diff --git a/songs/bob-marley/no-woman-no-cry.lisp b/songs/bob-marley/no-woman-no-cry.lisp
index deaaa80..80bb213 100644
--- a/songs/bob-marley/no-woman-no-cry.lisp
+++ b/songs/bob-marley/no-woman-no-cry.lisp
@@ -3,37 +3,23 @@
     (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))
+            :repeat 2
             ((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)))
+            :repeat 4
             ((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))))
+            :repeat 4
+            ((C G) ("Am" F))))
 
     (lyrics
         (intro)
diff --git a/src/main.lisp b/src/main.lisp
index d2090e5..2d3007e 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -71,7 +71,7 @@
        (if
          (eql key 'all)
          nil
-         (h "h3" nil (list (part-name key))))
+         (h "h3" '(("class" "g-Part__Title")) (list (part-name key))))
        children)))
 
 ; Chords
@@ -109,17 +109,26 @@
     nil
     (cons (chord-row (car xs)) (chord-rows (cdr xs)))))
 
-(defun chord-table (key row)
-  (part-tags 
-    key 
-    (h "table" '(("class" "g-Chords__Table")) (chord-rows row))))
+(defun chord-table (key x)
+  (let* ((is-repeat (eql (car x) :repeat))
+         (n (if is-repeat (second x) 1))
+         (rows (if is-repeat (cddr x) x)))
+    (part-tags 
+      key
+      (h
+        "div"
+        '(("class" "g-Chords__Section"))
+        (list
+          (h "table" '(("class" "g-Chords__Table")) (chord-rows rows))
+          (if (> n 1) (h "div" '(("class" "g-Chords__Multiplier")) (list (write-to-string n))) nil))))))
+
 
 (defun chord-tables (xs)
   (if
     (eql xs nil)
     nil
-    (let ((key (car (car xs)))
-          (rows (cdr (car xs))))
+    (let ((key (caar xs))
+          (rows (cdar xs)))
       (cons (chord-table key rows) (chord-tables (cdr xs))))))
 
 (defun chord-tags (chords tonality)