From 51458c071a8951fdb1bdf8c0adb814cc8e72cdcd Mon Sep 17 00:00:00 2001
From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Thu, 20 Feb 2014 12:39:04 +0100
Subject: [PATCH] Le Bourgeois Gentilhomme : Turcs, suite

---
 .../AWmuftiSuite/silence.ily                       |  1 -
 .../AXgiourdina/parts.ily                          |  3 +-
 .../AXgiourdina/score.ily                          | 13 +++---
 .../AXgiourdina/silence.ily                        |  1 -
 .../AXgiourdina/{basse.ily => voix-basse.ily}      |  2 +-
 .../{haute-contre.ily => voix-haute-contre.ily}    |  2 +-
 .../AXgiourdina/{taille1.ily => voix-taille1.ily}  |  2 +-
 .../AXgiourdina/{taille2.ily => voix-taille2.ily}  |  2 +-
 .../AYmahametta/basse.ily                          | 14 ++++---
 .../AYmahametta/dessus1.ily                        | 13 +++---
 .../AYmahametta/dessus2.ily                        | 14 ++++---
 .../AYmahametta/global.ily                         |  8 +---
 .../AYmahametta/paroles.ily                        | 34 +++++++--------
 .../AYmahametta/parts.ily                          |  9 ++--
 .../AYmahametta/score-dessus.ily                   |  7 ++++
 .../AYmahametta/score.ily                          | 34 ++++++++-------
 .../AYmahametta/silence.ily                        |  2 -
 .../AYmahametta/{mufti.ily => voix.ily}            | 13 +++---
 .../AZbonTurca/basse.ily                           |  2 +-
 .../AZbonTurca/global.ily                          |  6 +--
 .../AZbonTurca/haute-contre.ily                    | 27 ------------
 .../AZbonTurca/mufti-paroles.ily                   | 28 -------------
 .../AZbonTurca/mufti.ily                           | 31 --------------
 .../AZbonTurca/paroles.ily                         | 48 +++++++++++++---------
 .../AZbonTurca/parts.ily                           |  6 ++-
 .../AZbonTurca/score.ily                           | 45 +++++++++++---------
 .../AZbonTurca/silence.ily                         |  1 -
 .../AZbonTurca/voix-haute-contre.ily               | 27 ++++++++++++
 .../AZbonTurca/{taille1.ily => voix-taille1.ily}   | 10 ++---
 .../AZbonTurca/{taille2.ily => voix-taille2.ily}   | 12 +++---
 .../AZbonTurca/voix.ily                            | 36 ++++++++++++++++
 31 files changed, 231 insertions(+), 222 deletions(-)
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AWmuftiSuite/silence.ily
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/silence.ily
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/{basse.ily => voix-basse.ily} (87%)
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/{haute-contre.ily => voix-haute-contre.ily} (85%)
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/{taille1.ily => voix-taille1.ily} (87%)
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/{taille2.ily => voix-taille2.ily} (85%)
 rewrite Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/paroles.ily (99%)
 create mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score-dessus.ily
 rewrite Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score.ily (73%)
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/silence.ily
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/{mufti.ily => voix.ily} (75%)
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/haute-contre.ily
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti-paroles.ily
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti.ily
 rewrite Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/paroles.ily (100%)
 rewrite Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/score.ily (69%)
 delete mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/silence.ily
 create mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-haute-contre.ily
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/{taille1.ily => voix-taille1.ily} (85%)
 rename Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/{taille2.ily => voix-taille2.ily} (80%)
 create mode 100644 Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix.ily

diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AWmuftiSuite/silence.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AWmuftiSuite/silence.ily
deleted file mode 100644
index 326f0750..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AWmuftiSuite/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-R1*20\noBreak R1.*9
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/parts.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/parts.ily
index a0349079..8c70059c 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/parts.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/parts.ily
@@ -1 +1,2 @@
-\piecePartSpecs #`((voix))
+\piecePartSpecs
+#`((silence #:on-the-fly-markup , #{ \markup\lyrics { \tacet #11 } #}))
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/score.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/score.ily
index 43ca7377..7ae3b938 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/score.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/score.ily
@@ -1,9 +1,10 @@
 \score {
-  \new StaffGroupNoBar <<
+  \new ChoirStaff <<
     \new Staff <<
       \context Voice <<
         \global \clef bass
-        \hideNotes \notemode {
+        \origLayout { s1*6\break }
+        \hideNotes\notemode {
           sol8 sol8 sol8 sol8 sol8 sol8 sol8 sol8 
           sol8 sol8 sol8 sol8 sol8 sol8 sol8 sol8 |
           s1 s1 s1 |
@@ -19,16 +20,16 @@
       }
     >>
     \new Staff \withLyrics <<
-      \global \clef "vhaute-contre" \includeNotes "haute-contre"
+      \global \includeNotes "voix-haute-contre"
     >>  \includeLyrics "paroles"
     \new Staff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "taille1"
+      \global \includeNotes "voix-taille1"
     >>  \includeLyrics "paroles"
     \new Staff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "taille2"
+      \global \includeNotes "voix-taille2"
     >>  \includeLyrics "paroles"
     \new Staff \withLyrics <<
-      \global \clef "vbasse" \includeNotes "basse"
+      \global \includeNotes "voix-basse"
     >> \includeLyrics "paroles"
   >>
   \layout { }
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/silence.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/silence.ily
deleted file mode 100644
index c16956db..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-R1*11
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/basse.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-basse.ily
similarity index 87%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/basse.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-basse.ily
index 2343f6d7..8ef249f2 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/basse.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-basse.ily
@@ -1,4 +1,4 @@
-R1 |
+\clef "vbasse" R1 |
 R1 |
 r2 r4 sol4 |
 sol2 re4 sol4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/haute-contre.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-haute-contre.ily
similarity index 85%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/haute-contre.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-haute-contre.ily
index 1e96846e..50221b34 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/haute-contre.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-haute-contre.ily
@@ -1,4 +1,4 @@
-R1 |
+\clef "vhaute-contre" R1 |
 R1 |
 r2 r4 sol'4 |
 sol'2 fad'4 sol'4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille1.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille1.ily
similarity index 87%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille1.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille1.ily
index d10b8708..c0736cc9 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille1.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille1.ily
@@ -1,4 +1,4 @@
-R1 |
+\clef "vtaille" R1 |
 R1 |
 r2 r4 re'4 |
 re'2 re'4 re'4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille2.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille2.ily
similarity index 85%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille2.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille2.ily
index 2f45290f..44943b9e 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/taille2.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AXgiourdina/voix-taille2.ily
@@ -1,4 +1,4 @@
-R1 |
+\clef "vtaille" R1 |
 R1 |
 r2 r4 si4 |
 si2 la4 si4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/basse.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/basse.ily
index 23a200b7..399e4285 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/basse.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/basse.ily
@@ -1,8 +1,10 @@
-sol,2. sol4 ~ sol2 |
-sol2. sib2 sol4 |
-re'2. sib2 sol4 |
-mib'2 do'4 re'4 re2 |
-sol,2. sol4 ~ sol2 |
+\clef "basse" sol,2. \repeat unfold 2 {
+  sol2. |
+  sol2. sib2 sol4 |
+  re'2. sib2 sol4 |
+  mib'2 do'4 re'4 re2 |
+  sol,2.
+} sol2. |
 re2. mib2 do4 |
 fa2. re2. |
 mib2 mib4 do4 fa2 |
@@ -26,4 +28,4 @@ sol2 sol4 r4 r8 sol8 sol4 |
 sol2 sol4 sib2 sol4 |
 re'2 re'4 sib2 sol4 |
 mib'2 do'4 re'2 re4 |
-sol2 sol2
\ No newline at end of file
+sol2 sol4
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus1.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus1.ily
index 44c3bbef..5d0fbd39 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus1.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus1.ily
@@ -1,8 +1,9 @@
-r1 r8 re'8 re'4 |
-mib'2 re'2 sol''8 fad''8 sol''8 la''8  |
-fad''2 fad''4 sol''4. la''8 sib''8 la''8  |
-sol''4. sol''8 la''4 sol''4 fad''4. mi''16 fad''16  |
-sol''2 sol''2 r8 re''8 mi''4  |
+\clef "dessus" r2 r \repeat unfold 2 { r8 re''8 re''4 |
+  mib''2 re''2 sol''8 fad''8 sol''8 la''8  |
+  fad''2 fad''4 sol''4. la''8 sib''8 la''8  |
+  sol''4. sol''8 la''4 sol''4 fad''4. mi''16 fad''16  |
+  sol''2 sol''2
+} r8 re''8 mi''4  |
 fa''2. sib'4 sib'4 mib''4  |
 do''2 do''4 re''2 re''4  |
 sol'2 sol'4 do''4 la'2  |
@@ -26,4 +27,4 @@ sol''2 sol''4 r4 r8 re''8 re''4 |
 mib''2 re''2 sol''8 fad''8 sol''8 la''8 |
 fad''2 fad''4 sol''4. la''8 sib''8 la''8 |
 sol''4. sol''8 la''4 sol''4 fad''4. mi''16 fad''16 |
-sol''2 sol''2 
\ No newline at end of file
+sol''2 sol''4
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus2.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus2.ily
index 232fdf85..b9bea78f 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus2.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/dessus2.ily
@@ -1,8 +1,10 @@
-r1 r8 sib'8 sib'4 |
-do''2 sib'2 sib'8 la'8 sib'8 do''8 |
-la'2 la'4 sib'4. do''8 re''8 do''8 |
-sib'4. sib'8 do''4 sib'4 la'4. sol'8 |
-sol'2 sol'2 r8 sib'8 sib'4 |
+\clef "dessus" r2 r \repeat unfold 2 {
+  r8 sib'8 sib'4 |
+  do''2 sib'2 sib'8 la'8 sib'8 do''8 |
+  la'2 la'4 sib'4. do''8 re''8 do''8 |
+  sib'4. sib'8 do''4 sib'4 la'4. sol'8 |
+  sol'2 sol'2
+} r8 sib'8 sib'4 |
 la'2 sib'4 sol'4 sol'4 do''4 |
 la'2 la'4 fa''2 fa''4 |
 sib'2 sib'4 mib''4 do''4. sib'16 do''16 |
@@ -26,4 +28,4 @@ sol'2 sol'4 r4 r8 sib'8 sib'4 |
 do''2 sib'2 sib'8 la'8 sib'8 do''8 |
 la'2 la'4 sib'4. do''8 re''8 do''8 |
 sib'4. sib'8 do''4 sib'4 la'4. sol'8 |
-sol'2 sol'2 
\ No newline at end of file
+sol'2 sol'4
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/global.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/global.ily
index cacd2d56..41ce8bc0 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/global.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/global.ily
@@ -1,6 +1,2 @@
-\oldKey re \minor
-\newKey sol \minor
-\midiTempo #160 \time 6/4
-s1 \bar ".|:" s2 s1.*3 s1 
-\bar ":..:" s2
-s1.*23 s1 \bar ":|."
\ No newline at end of file
+\key re \minor \midiTempo #160 \time 6/4
+s1.*32 s2. \bar "|."
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/paroles.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/paroles.ily
dissimilarity index 99%
index 55be9dd7..7f364d7f 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/paroles.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/paroles.ily
@@ -1,16 +1,18 @@
-Maha -- met -- ta per giour -- di -- na
-mi pre -- gar se -- ra é mat -- ti -- "na :"
-
-vo -- ler far un pa -- la -- di -- na
-dé giour -- di -- na dé giour -- di -- na.
-
-Dar tur -- ban -- ta é dar scar -- ci -- na
-con ga -- le -- "ra é" bri -- gan -- ti -- na
-per def -- fen -- der Pa -- les -- ti -- na
-dar tur -- ban -- ta é dar scar -- ci -- na
-con ga -- le -- "ra é" bri -- gan -- ti -- na
-per def -- fen -- der Pa -- les -- ti -- na.
-Maha -- met -- ta per giour -- di -- na
-mi pre -- gar se -- ra é mat -- ti -- na
-vo -- ler far un pa -- la -- di -- na
-dé giour -- di -- na dé giour -- di -- na.
\ No newline at end of file
+Ma -- ha -- met -- ta per Giour -- di -- na
+Mi pre -- gar se -- ra é mat -- ti -- na :
+Ma -- ha -- met -- ta per giour -- di -- na
+Mi pre -- gar se -- ra é mat -- ti -- na :
+
+Vo -- ler far un Pa -- la -- di -- na
+Dé Giour -- di -- na, dé Giour -- di -- na.
+
+Dar Tur -- ban -- ta é e -- dar scar -- ci -- na
+Con Ga -- le -- ra é Bri -- gan -- ti -- na
+Per def -- fen -- der Pa -- les -- ti -- na.
+Dar Tur -- ban -- ta é e -- dar scar -- ci -- na
+Con Ga -- le -- ra é Bri -- gan -- ti -- na
+Per def -- fen -- der Pa -- les -- ti -- na.
+Ma -- ha -- met -- ta per Giour -- di -- na
+Mi pre -- gar se -- ra é mat -- ti -- na :
+Ma -- ha -- met -- ta per Giour -- di -- na
+Mi pre -- gar se -- ra é mat -- ti -- na.
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/parts.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/parts.ily
index 68a33dc1..85d7f42e 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/parts.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/parts.ily
@@ -1,4 +1,5 @@
-\piecePartSpecs #`((dessus1 #:notes "dessus1")
-                   (dessus2 #:notes "dessus2")
-                   (voix)
-                   (basse))
+\piecePartSpecs
+#`((dessus #:score "score-dessus")
+   (basse)
+   (silence #:on-the-fly-markup , #{ \markup\lyrics { \tacet #32 } #}))
+
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score-dessus.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score-dessus.ily
new file mode 100644
index 00000000..ab381f74
--- /dev/null
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score-dessus.ily
@@ -0,0 +1,7 @@
+\score {
+  \new GrandStaff <<
+    \new Staff << \global \includeNotes "dessus1" >>
+    \new Staff << \global \includeNotes "dessus2" >>
+  >>
+  \layout { }
+}
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score.ily
dissimilarity index 73%
index 7269c600..07122c34 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/score.ily
@@ -1,14 +1,20 @@
-\score {
-  \new StaffGroupNoBar <<
-    \new StaffGroupNoBracket <<
-      \new Staff << \global \clef "dessus" \includeNotes "dessus1" >>
-      \new Staff << \global \clef "dessus" \includeNotes "dessus2" >>
-    >>
-    \new Staff \withLyrics <<
-      \global \clef "vbasse" \includeNotes "mufti" 
-    >> \includeLyrics "paroles"
-    \new Staff << \global \clef "basse" \includeNotes "basse" >>
-  >>
-  \layout { }
-  \midi { }
-}
+\score {
+  \new ChoirStaff <<
+    \new GrandStaff <<
+      \new Staff << \global \includeNotes "dessus1" >>
+      \new Staff << \global \includeNotes "dessus2" >>
+    >>
+    \new Staff \withLyrics <<
+      \global \includeNotes "voix" 
+    >> \includeLyrics "paroles"
+    \new Staff <<
+      \global \includeNotes "basse"
+      \origLayout {
+        s1.*5\break s1.*4\break s1.*5\break s1.*5\pageBreak
+        s1.*5\break s1.*5\break
+      }
+    >>
+  >>
+  \layout { }
+  \midi { }
+}
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/silence.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/silence.ily
deleted file mode 100644
index f6c3c7e6..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/silence.ily
+++ /dev/null
@@ -1,2 +0,0 @@
-r1\noBreak r2\noBreak R1.*3\noBreak r1\noBreak r2\noBreak
-R1.*23\noBreak r1
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/mufti.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/voix.ily
similarity index 75%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/mufti.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/voix.ily
index db7e4f39..973772ea 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/mufti.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AYmahametta/voix.ily
@@ -1,8 +1,9 @@
-r1 r8 sol8 sol4 |
-sol2 sol4 sib2 sol4 |
-re'2 re'4 sib2 sol4 |
-mib'2 do'4 re'4 re2 |
-sol2 sol2 r8 sol8 sol4 |
+\clef "vbasse" r2 r \repeat unfold 2 { r8 sol8 sol4 |
+  sol2 sol4 sib2 sol4 |
+  re'2 re'4 sib2 sol4 |
+  mib'2 do'4 re'4 re2 |
+  sol2 sol2
+} r8 sol8 sol4 |
 re2. mib4 mib4 do4 |
 fa2. fa4 r8 sib8 re4 |
 mib2 mib4 do4 fa2 |
@@ -26,4 +27,4 @@ sol2 sol4 r4 r8 sol8 sol4 |
 sol2 sol4 sib2 sol4 |
 re'2 re'4 sib2 sol4 |
 mib'2 do'4 re'2 re4 |
-sol2 sol2 
\ No newline at end of file
+sol2 sol4
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/basse.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/basse.ily
index eaf3fd61..388bdd03 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/basse.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/basse.ily
@@ -1,4 +1,4 @@
-sol,4. sol8 la4 |
+\clef "basse" sol,4. sol8 la4 |
 sib2 mib2 fa2 |
 sib,2. re4 mib2 |
 sib,2. re4 mib2 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/global.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/global.ily
index 39e47390..4e709a17 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/global.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/global.ily
@@ -1,4 +1,2 @@
-\oldKey re \minor
-\newKey sol \minor
-\midiTempo #216 \time 6/4
-\partial 2. s2. s1.*29 s4. \bar ":|."
\ No newline at end of file
+\key re \minor \midiTempo #216 \time 6/4
+\partial 2. s2. s1.*29 s4. \bar "|."
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/haute-contre.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/haute-contre.ily
deleted file mode 100644
index ff84636e..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/haute-contre.ily
+++ /dev/null
@@ -1,27 +0,0 @@
-r2. |
-R1. | 
-r2. fa'4 sol'2 |
-fa'2. fa'4 sol'2 |
-fa'2. r2. |
-R1. |
-r2. fa'4 mi'2 |
-fad'2. fa'4 mi'2 |
-fad'2. r2. |
-R1.*5 |
-r4 r8 sol8 sol4 sol4. sol8 fa4 |
-sol4. fa8 mib4 mib4. mib8 fa4 |
-fa4. fa8 fa4 fa4. fa8 fa4 |
-fa4. fa8 fa4 fa4. fa8 fa4 |
-fa4. re8 re4 re4. re8 re4 |
-do4. do8 fa4 re4. re8 sol4 |
-fad4. fad8 fad4 sol4. fad8 mi4 |
-fad4. fad8 fad4 sol4. fad8 mi4 |
-fad4. fad8 fad4 sol4. sol8 sol4 |
-mi4. mi8 mi4 fa4. fa8 fa4 |
-fa4. fa8 fa4 sol4. sol8 sol4 |
-sol4. sol8 sol4 la4. sol8 fad4 |
-sol4. sol8 sol4 la4. sol8 fad4 |
-sol4. sol8 sol4 la4. sol8 fad4 |
-sol4. re8 re4 re4. re8 re4 |
-sol4. sol8 sol4 sol4. sol8 fad4 |
-sol4. 
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti-paroles.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti-paroles.ily
deleted file mode 100644
index 4ed1c02e..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti-paroles.ily
+++ /dev/null
@@ -1,28 +0,0 @@
-Star bon tur -- ca giour -- di -- "na ?"
-hi val -- la hi val -- la
-star bon tur -- ca giour -- di -- na giour -- di -- na
-hi val -- la hi val -- la
-
-hu la ba ba la chou 
-ba la ba ba la da 
-ba la ba ba la da 
-ba la ba ba la da 
-hu la ba ba la chou 
-ba la ba ba la da
-
-hu la ba ba la chou 
-ba la ba ba la da 
-hu la ba ba la da
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti.ily
deleted file mode 100644
index 8a611e10..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/mufti.ily
+++ /dev/null
@@ -1,31 +0,0 @@
-r4 r8 sol8 la4 |
-sib4 sib4 sib4 sib4 ( la2 )|
-sib2. re4 mib2 |
-sib,2. re4 mib2 |
-sib,2. r4 sib4 sib4 |
-la4 la4 sib4 sol4 sol4 la4 |
-fad2 fad4 re4 la,2 |
-re2. re4 la,2 |
-re4. re'8 re'4 si4. la8 si4 |
-do'4. do'8 do'4 la4. la8 la4 |
-sib4. sib8 sib4 sib4. sib8 la4 |
-sib4. sib8 sib4 sib4. sib8 la4 |
-sib4. sib8 sib4 sib4. sib8 la4 |
-sol4. sol8 sol4 sol4. la8 fad4 |
-sol4. sol8 sol4 sol4. sol8 re4 |
-mib4. mib8 mib4 do4. do8 fa4 |
-sib,4. sib8 sib4 sib4. sib8 fa4 |
-sib4. sib8 sib4 sib4. sib8 fa4 |
-sib4. sib,8 sib,4 sib,4. sib,8 sib,4 |
-fa4. fa8 fa4 sol4. sol8 sol4 |
-re4. re8 re4 re4. re8 la,4 |
-re4. re8 re4 re4. re8 la,4 |
-re4. re8 re4 sol4. sol8 sol4 |
-do4. do8 do4 fa4. fa8 fa4 |
-sib,4. sib,8 sib,4 mib4. mib8 mib4 |
-do4. do8 do4 re4. re8 re4 |
-sol,4. sol8 sol4 sol4. sol8 re4 |
-sol4. sol8 sol4 sol4. sol8 re4 |
-sol4. sol8 sol4 sol4. sol8 re4 |
-mib4. mib8 mib4 do4. do8 re4 |
-sol,4. 
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/paroles.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/paroles.ily
dissimilarity index 100%
index f66d38a5..ac98070f 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/paroles.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/paroles.ily
@@ -1,19 +1,29 @@
-hi val -- la hi val -- la
-hi val -- la hi val -- la
-
-hu la ba ba la chou 
-ba la ba ba la da 
-hu la ba ba la da
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
-hu la ba ba la chou
-ba la ba ba la da
+\tag #'(mufti basse) {
+  Star bon Tur -- ca, Giour -- di -- na.
+}
+\tag #'(mufti turcs basse) {
+  Hi val -- la
+  Hi val -- la.
+}
+\tag #'(mufti basse) {
+  Star bon Tur -- ca, Giour -- di -- na, Giour -- di -- na.
+}
+\tag #'(mufti turcs basse) {
+  Hi val -- la
+  Hi val -- la.
+}
+\tag #'(mufti basse) {
+  Hu la ba ba la chou ba la ba ba la da
+  ba la ba ba la da ba la ba ba la da 
+  Hu la ba ba la chou ba la ba ba la da
+}
+\tag #'(mufti turcs) {
+  Hu la ba ba la chou ba la ba ba la da 
+  Hu la ba ba la da ba la ba ba la da
+  Hu la ba ba la chou ba la ba ba la da
+  Hu la ba ba la chou ba la ba ba la da
+  Hu la ba ba la chou ba la ba ba la da
+  Hu la ba ba la chou ba la ba ba la da
+  Hu la ba ba la ba ba la ba ba la da
+  Hu la ba ba la ba ba la ba ba la da
+}
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/parts.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/parts.ily
index 99efab76..6d8fd906 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/parts.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/parts.ily
@@ -1,2 +1,4 @@
-\piecePartSpecs #`((voix)
-                   (basse))
+\piecePartSpecs
+#`((basse #:score-template "score-basse-voix")
+   (silence #:on-the-fly-markup , #{ \markup\lyrics { \tacet #30 } #}))
+
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/score.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/score.ily
dissimilarity index 69%
index ac49ee71..af4b1ba1 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/score.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/score.ily
@@ -1,19 +1,26 @@
-\score {
-  \new StaffGroupNoBar <<
-    \new Staff \withLyrics <<
-      \global \clef "vhaute-contre" \includeNotes "haute-contre"
-    >>  \includeLyrics "paroles"
-    \new Staff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "taille1"
-    >>  \includeLyrics "paroles"
-    \new Staff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "taille2"
-    >>  \includeLyrics "paroles"
-    \new Staff \withLyrics <<
-      \global \clef "vbasse" \includeNotes "mufti"
-    >>  \includeLyrics "mufti-paroles"
-    \new Staff << \global \clef "basse" \includeNotes "basse" >> 
-  >>
-  \layout { }
-  \midi { }
-}
+\score {
+  \new StaffGroupNoBar <<
+    \new Staff \withLyrics <<
+      \global \includeNotes "voix-haute-contre"
+    >> \keepWithTag #'turcs \includeLyrics "paroles"
+    \new Staff \withLyrics <<
+      \global \includeNotes "voix-taille1"
+    >> \keepWithTag #'turcs \includeLyrics "paroles"
+    \new Staff \withLyrics <<
+      \global \includeNotes "voix-taille2"
+    >> \keepWithTag #'turcs \includeLyrics "paroles"
+    \new Staff \withLyrics <<
+      \global \keepWithTag #'mufti \includeNotes "voix"
+    >> \keepWithTag #'mufti \includeLyrics "paroles"
+    \new Staff <<
+      \global \includeNotes "basse"
+      \origLayout {
+        s2. s1.*5\break s1.*6\pageBreak
+        s1.*5\break s1.*5\pageBreak
+        s1.*5\break
+      }
+    >>
+  >>
+  \layout { }
+  \midi { }
+}
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/silence.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/silence.ily
deleted file mode 100644
index 3e376022..00000000
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-r2.\noBreak R1.*29\noBreak r4.
\ No newline at end of file
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-haute-contre.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-haute-contre.ily
new file mode 100644
index 00000000..179b9f1a
--- /dev/null
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-haute-contre.ily
@@ -0,0 +1,27 @@
+\clef "vhaute-contre" r2*3/2 |
+R1. | 
+r2*3/2 fa'4 sol'2 |
+fa'2. fa'4 sol'2 |
+fa'2. r2*3/2 |
+R1. |
+r2*3/2 fa'4 mi'2 |
+fad'2. fa'4 mi'2 |
+fad'2. r2*3/2 |
+R1.*5 |
+r4 r8 sol'8 sol'4 sol'4. sol'8 fa'4 |
+sol'4. fa'8 mib'4 mib'4. mib'8 fa'4 |
+fa'4. fa'8 fa'4 fa'4. fa'8 fa'4 |
+fa'4. fa'8 fa'4 fa'4. fa'8 fa'4 |
+fa'4. re'8 re'4 re'4. re'8 re'4 |
+do'4. do'8 fa'4 re'4. re'8 sol'4 |
+fad'4. fad'8 fad'4 sol'4. fad'8 mi'4 |
+fad'4. fad'8 fad'4 sol'4. fad'8 mi'4 |
+fad'4. fad'8 fad'4 sol'4. sol'8 sol'4 |
+mi'4. mi'8 mi'4 fa'4. fa'8 fa'4 |
+fa'4. fa'8 fa'4 sol'4. sol'8 sol'4 |
+sol'4. sol'8 sol'4 la'4. sol'8 fad'4 |
+sol'4. sol'8 sol'4 la'4. sol'8 fad'4 |
+sol'4. sol'8 sol'4 la'4. sol'8 fad'4 |
+sol'4. re'8 re'4 re'4. re'8 re'4 |
+sol'4. sol'8 sol'4 sol'4. sol'8 fad'4 |
+sol'4.
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille1.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille1.ily
similarity index 85%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille1.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille1.ily
index 9b54ab4f..37bc8802 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille1.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille1.ily
@@ -1,12 +1,12 @@
-r2. |
+\clef "vtaille" r2*3/2 |
 R1. |
-r2. fa'4 mib'2 |
+r2*3/2 fa'4 mib'2 |
 re'2. fa'4 mib'2 |
-re'2. r2. |
+re'2. r2*3/2 |
 R1. |
-r2. re'4 dod'2 |
+r2*3/2 re'4 dod'2 |
 re'2. re'4 dod'2 |
-re'2. r2. |
+re'2. r2*3/2 |
 R1.*5 |
 r4 r8 re'8 re'4 re'4. re'8 re'4 |
 sib4. sib8 sib4 do'4. do'8 do'4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille2.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille2.ily
similarity index 80%
rename from Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille2.ily
rename to Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille2.ily
index 245b2a82..29496a22 100644
--- a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/taille2.ily
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix-taille2.ily
@@ -1,12 +1,12 @@
-r2. |
+\clef "vtaille" r2*3/2 |
 R1. |
-r2. sib4 sib2 |
+r2*3/2 sib4 sib2 |
 sib2. sib4 sib2 |
-sib2. r2. |
+sib2. r2*3/2 |
 R1. |
-r2. la4 la2 |
+r2*3/2 la4 la2 |
 la2. la4 la2 |
-la2. r2. |
+la2. r2*3/2 |
 R1.*5 |
 r4 r8 sib8 sib4 sib4. sib8 sib4 |
 sol4. sol8 sol4 la4. la8 la4 |
@@ -19,7 +19,7 @@ la4. la8 la4 la4. la8 la4 |
 la4. la8 la4 si4. si8 si4 |
 do'4. sol8 sol4 la4. la8 la4 |
 sib4. sib8 sib4 sib4. sib8 sib4 |
-do'4. do'8 do'4 sol4. sib8 la4 |
+do'4. do'8 do'4 la4. sib8 la4 |
 sol4. sib8 sib4 do'4. sib8 la4 |
 sib4. sib8 sib4 do'4. sib8 la4 |
 sib4. sol8 sol4 sol4. sol8 sib4 |
diff --git a/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix.ily b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix.ily
new file mode 100644
index 00000000..8ee0ea56
--- /dev/null
+++ b/Lully/Comedie/LWV43LeBourgeoisGentilhomme/AZbonTurca/voix.ily
@@ -0,0 +1,36 @@
+\clef "vbasse" r4 r8 sol8 la4 |
+sib4 sib4 sib4 sib4 ( la2 )|
+sib2. re4 mib2 |
+sib,2. re4 mib2 |
+sib,2. r4 sib4 sib4 |
+la4 la4 sib4 sol4 sol4 la4 |
+fad2 fad4 re4 la,2 |
+re2. re4 la,2 |
+re4. re'8 re'4 si4. la8 si4 |
+do'4. do'8 do'4 la4. la8 la4 |
+sib4. sib8 sib4 sib4. sib8 la4 |
+sib4. sib8 sib4 sib4. sib8 la4 |
+sib4. sib8 sib4 sib4. sib8 la4 |
+sol4. sol8 sol4 sol4. la8 fad4 |
+sol4. <<
+  \tag #'basse { r4 r8 r2*3/2 | R1.*15 | r4 r8 }
+  \tag #'mufti {
+    sol8 sol4 sol4. sol8 re4 |
+    mib4. mib8 mib4 do4. do8 fa4 |
+    sib,4. sib8 sib4 sib4. sib8 fa4 |
+    sib4. sib8 sib4 sib4. sib8 fa4 |
+    sib4. sib,8 sib,4 sib,4. sib,8 sib,4 |
+    fa4. fa8 fa4 sol4. sol8 sol4 |
+    re4. re8 re4 re4. re8 la,4 |
+    re4. re8 re4 re4. re8 la,4 |
+    re4. re8 re4 sol4. sol8 sol4 |
+    do4. do8 do4 fa4. fa8 fa4 |
+    sib,4. sib,8 sib,4 mib4. mib8 mib4 |
+    do4. do8 do4 re4. re8 re4 |
+    sol,4. sol8 sol4 sol4. sol8 re4 |
+    sol4. sol8 sol4 sol4. sol8 re4 |
+    sol4. sol8 sol4 sol4. sol8 re4 |
+    mib4. mib8 mib4 do4. do8 re4 |
+    sol,4.
+  }
+>>
-- 
2.11.4.GIT