From 05456a9a443d561c2b3ec10943b480a4555ecc87 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Sat, 21 Aug 2021 23:42:23 +0200
Subject: [PATCH] Reorder things correctly, add acmpt

---
 siffler-en-presquile.ly | 67 +++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/siffler-en-presquile.ly b/siffler-en-presquile.ly
index a6c4b4d..9a2d299 100644
--- a/siffler-en-presquile.ly
+++ b/siffler-en-presquile.ly
@@ -1,34 +1,61 @@
 \version "2.22.1"
 
-voixUn = {
+part_a = \new Staff {
   \relative {
     \clef "treble"
     \key d \minor
-    r8 f'  f16 g8 a16~   8 a g f | e  a   a   gis16 a~   2   |
-    r16 d,~ 8 d16 e8 f16~   8 f e d | c  f   a,  g16   a~   2   |
-    r8 g  g a16 bes~ 2       | d8 cis d   e16   d~   2   |
-    e4    cis        d   e   | e8 d   d   e16   f~   2   \bar "||"
+    r8 f'' f16 g8 a16~ 8 a g f | e a a gis16 a~ 2 |
+    r16 d,~ 8 d16 e8 f16~ 8 f e d | c f a, g16 a~ 2 |
+    r8 g g a16 bes~ 2 | d8 cis d e16 d~ 2 |
+    e4 cis d e | e8 d d e16 f~ 2 \bar "||"
   }
 }
 
-voixDeux = {
+part_a_bis = \new Staff {
   \relative {
-    \clef "bass"
+    \clef "treble"
     \key d \minor
-    f'2 c4 a | g8 f' f e16 e~   4 r |
-    d2 a4 f | e8 d'  cis b16   cis~ 4 r \bar "||"
+    f''2 c4 a | g8 f' f e16 e~ 4 r |
+    d2 a4 f | e8 d' cis b16 cis~ 4 r \bar "||"
   }
 }
 
-<<
-  { \voixUn }
-  { \voixDeux }
->>
-
-\relative {
-  \key d \minor
-  d''2~ 8 a d e | cis2 r |
-  c2~ 8 a c d | c16 b b8 b4 r2 |
-  bes2~ 8 g d' e | f16 e d8 d e f4 r |
-  cis2~ 8 a cis d | e16 d cis8 d4 r2 |
+part_b_lead = \new Staff {
+  \relative {
+    \clef "treble"
+    \key d \minor
+    d''2~ 8 a d e |
+    cis2 r |
+    c2~ 8 a c d |
+    c16 b b8 b4 r2 |
+    bes2~ 8 g d' e |
+    f16 e d8 d e f4 r |
+    cis2~ 8 a cis d |
+    e16 d cis8 d4 r2 |
+  }
+}
+
+part_b_accmp = \new Staff {
+  \relative {
+    \clef "treble"
+    \key d \minor
+    d'8 d16 e f e d8 d d16 e f e d8 |
+    cis8 cis16 d e d cis8 cis cis16 d e d cis8 |
+    c8 c16 d e d c8 c c16 d e d c8 |
+    b8 b16 c d c b8 b b16 c d c b8 |
+    bes8 bes16 c d c bes8 bes bes16 c d c bes8 |
+    a8 d16 e f e d8 d d16 e f e d8 |
+    cis8 cis16 d e d cis8 cis cis16 d e d cis8 |
+    d8 d16 e f e d8 d d16 e f e d8 |
+  }
+}
+
+
+{ \part_a }
+{ \part_a_bis }
+{
+  <<
+    \part_b_lead
+    \part_b_accmp
+  >>
 }