From 6fb2a33c685c67e0053bbdab77b0a9195669ef02 Mon Sep 17 00:00:00 2001
From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sat, 19 Apr 2014 13:33:15 +0200
Subject: [PATCH] =?utf8?q?Armide=20:=20acte=203=20sc=C3=A8ne=204=20[4/5]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Lully/Opera/LWV71Armide/DDDair/basse.ily        |  7 +++++--
 Lully/Opera/LWV71Armide/DDDair/dessus.ily       | 20 +++++++++++++-------
 Lully/Opera/LWV71Armide/DDDair/global.ily       |  7 +++----
 Lully/Opera/LWV71Armide/DDDair/haute-contre.ily |  6 +++---
 Lully/Opera/LWV71Armide/DDDair/parts.ily        |  3 +--
 Lully/Opera/LWV71Armide/DDDair/quinte.ily       |  2 +-
 Lully/Opera/LWV71Armide/DDDair/score.ily        | 18 +++++++++++++++++-
 Lully/Opera/LWV71Armide/DDDair/silence.ily      |  1 -
 Lully/Opera/LWV71Armide/DDDair/taille.ily       |  6 +++---
 Lully/Opera/LWV71Armide/acte3.ily               |  9 ++++++---
 10 files changed, 52 insertions(+), 27 deletions(-)
 delete mode 100644 Lully/Opera/LWV71Armide/DDDair/silence.ily

diff --git a/Lully/Opera/LWV71Armide/DDDair/basse.ily b/Lully/Opera/LWV71Armide/DDDair/basse.ily
index 17ba9dad..15da58ba 100644
--- a/Lully/Opera/LWV71Armide/DDDair/basse.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/basse.ily
@@ -1,4 +1,4 @@
-fa4 |
+\clef "basse" fa4 |
 re4 mi4 fa4 sib,4 do4 do,4 |
 fa,4 fa8 mi8 re8 mi8 fa8 re8 sol8 la8 sol8 fa8 |
 mi8 fa8 mi8 re8 do4 fa8 sol8 fa8 mi8 re4 |
@@ -16,4 +16,7 @@ fa,2. fa4 mib8 re8 do8 sib,8 |
 la,4 fa,2 sib,8 do8 sib,8 la,8 sol,8 fa,8 |
 do8 sib,8 la,8 sib,8 do8 la,8 re8 do8 sib,8 do8 re8 sib,8 |
 do4 la,2 sol,8 fa,8 do4 do,4 |
-fa,2. ~ fa,2 
\ No newline at end of file
+fa,2. ~ fa,2 s4 |
+\forceFullClef\clef "basse" \digitTime\time 2/2 \bar ""
+fa,2_"Fin de l’Entrée."~ fa,8 sol, fa, mi, |
+\custosNote re,4 
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDDair/dessus.ily b/Lully/Opera/LWV71Armide/DDDair/dessus.ily
index 0acce90a..32265b78 100644
--- a/Lully/Opera/LWV71Armide/DDDair/dessus.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/dessus.ily
@@ -1,19 +1,25 @@
-do''4 |
+\clef "dessus" do''4 |
 fa'4 sol'4 la'4 sib'4 sol'4 do''4 |
 la'4 fa'4 fa''2 re''2 |
-sol''4. fa''8 mi''8 re''8 do''4 do''4 re''4 |
+sol''4. fa''8 mi''8 re''8 do''4 do''4
+\footnoteHere #'(0 . 0) \markup\wordwrap {
+  Source : un \italic do est imprimé, corrigé en \italic ré.
+} re''4 |
 si'4 sol'4 mib''2 re''4 mib''4 |
-do''4 si'4 do''4 re''4 re''4. do''8 |
+do''4 si'4 do''4 re''4 re''4.\tr do''8 |
 do''2. ~ do''2 sol'4 |
 sol'4. la'8 sib'4 la'4 re''2 |
-dod''4 la'4 la''2 mi''4. mi''8 |
-fa''4. sol''8 la''4 sol''8 fa''8 mi''4. re''8 |
+\footnoteHere #'(0 . 0) \markup\wordwrap {
+  Source : un \italic sol imprimé et barré précède ce \italic do♯.
+}
+dod''4 la'4 la''2 mi''4.\tr mi''8 |
+fa''4. sol''8 la''4 sol''8 fa''8 mi''4.\tr re''8 |
 re''4. mi''8 fa''4 la'8 sol'8 fa'8 sol'8 la'8 sib'8 |
 do''8 sib'8 do''8 re''8 mi''8 do''8 fa''8 sol''8 fa''8 mi''8 fa''8 re''8 |
 sol''4 mi''4 la''2 fa''2 |
-sib''4. la''8 la''4. sol''8 sol''4. fa''8 |
+sib''4. la''8 la''4.\tr sol''8 sol''4.\tr fa''8 |
 fa''4 mib''8 re''8 do''8 sib'8 la'4. sib'8 la'8 sib'8 |
 do''8 re''8 do''8 re''8 mib''8 fa''8 re''4. do''8 sib'8 la'8 |
 sol'4 do''2 la'4 re''2 |
-sol'4 do''2 sib'8 la'8 sol'4. fa'8 |
+sol'4 do''2 sib'8 la'8 sol'4.\tr fa'8 |
 fa'2. ~ fa'2 
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDDair/global.ily b/Lully/Opera/LWV71Armide/DDDair/global.ily
index 33c0e53e..d2fd6d7c 100644
--- a/Lully/Opera/LWV71Armide/DDDair/global.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/global.ily
@@ -1,5 +1,4 @@
-\keys fa \major
-\midiTempo #160 \time 6/4
-\markUpBegin \mark "Vite"
-\partial 4 s4 s1.*5 s2. s2 \bar ":|."
+\key fa \major \midiTempo#160
+\beginMarkSmall "viste"
+\time 6/4 \partial 4 s4 s1.*5 s2. s2 \bar ":|."
 s4 s1.*11 s2. s2 \bar "|."
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDDair/haute-contre.ily b/Lully/Opera/LWV71Armide/DDDair/haute-contre.ily
index d4b52850..5f2ac45e 100644
--- a/Lully/Opera/LWV71Armide/DDDair/haute-contre.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/haute-contre.ily
@@ -1,10 +1,10 @@
-fa'4 |
+\clef "haute-contre" fa'4 |
 fa'4 mi'4 do'4 re'4 do'4 do'4 |
 do'2 re'2 re'2 |
 mi'2 mi'4 fa'2 fa'4 |
 sol'2 sol'2 sol'4 sol'4 |
 mib'4 sol'4 mib'4 fa'4 re'4 sol'4 |
-mi'2. ~ mi'2 mi'4 |
+mi'2.\tr ~ mi'2 mi'4 |
 mi'4. fad'8 sol'4 fad'4 fad'4 sol'4 |
 mi'4 mi'4 fa'2 la'4. dod''8 |
 re''2 re''4 dod''8 re''8 dod''4. re''8 |
@@ -15,5 +15,5 @@ re''4 do''4 do''4 re''4 do''4. do''8 |
 la'8 sib'8 do''8 sib'8 la'8 sol'8 fa'2. |
 fa'4 fa'2 fa'4. fa'8 mi'8 fa'8 |
 mi'4 la'2 fa'4 sib'2 |
-mi'4 la'2 mi'8 fa'8 mi'4. fa'8 |
+mi'4 la'2 mi'8 fa'8 mi'4.\tr fa'8 |
 fa'2. ~ fa'2 
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDDair/parts.ily b/Lully/Opera/LWV71Armide/DDDair/parts.ily
index 0f1b54be..85a7ac99 100644
--- a/Lully/Opera/LWV71Armide/DDDair/parts.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/parts.ily
@@ -1,5 +1,4 @@
-\piecePartSpecs #`((dessus1)
-                   (dessus2)
+\piecePartSpecs #`((dessus)
                    (haute-contre)
                    (taille)
                    (quinte)
diff --git a/Lully/Opera/LWV71Armide/DDDair/quinte.ily b/Lully/Opera/LWV71Armide/DDDair/quinte.ily
index 6464ed60..64c16ddc 100644
--- a/Lully/Opera/LWV71Armide/DDDair/quinte.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/quinte.ily
@@ -1,4 +1,4 @@
-la4 |
+\clef "quinte" la4 |
 la4 sol4 fa4 fa4 fa4 mi4 |
 fa2 fa2 sol2 |
 sol2 sol4 la2 la4 |
diff --git a/Lully/Opera/LWV71Armide/DDDair/score.ily b/Lully/Opera/LWV71Armide/DDDair/score.ily
index 30b59b57..b5fba286 100644
--- a/Lully/Opera/LWV71Armide/DDDair/score.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/score.ily
@@ -1,5 +1,21 @@
 \score {
-  \dessusHauteContreTailleQuinteBasse
+  <<
+    \setMusic #'group <<
+      \new Staff << \global \includeNotes "dessus" >>
+      \new Staff << \global \includeNotes "haute-contre" >>
+      \new Staff << \global \includeNotes "taille" >>
+      \new Staff << \global \includeNotes "quinte" >>
+      \new Staff <<
+        \global \includeNotes "basse"
+        \origLayout {
+          s4 s1.*4\break s1.*4\pageBreak
+          s1.*4\break s1.*4\pageBreak
+        }
+      >>
+    >>
+    \origVersion \new StaffGroupNoBar \group
+    \modVersion \new StaffGroup \group
+  >>
   \layout { }
   \midi { }
 }
diff --git a/Lully/Opera/LWV71Armide/DDDair/silence.ily b/Lully/Opera/LWV71Armide/DDDair/silence.ily
deleted file mode 100644
index d624f3ba..00000000
--- a/Lully/Opera/LWV71Armide/DDDair/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-r4 R1.*5 r2. r2 r4 R1.*11 r2. r2
diff --git a/Lully/Opera/LWV71Armide/DDDair/taille.ily b/Lully/Opera/LWV71Armide/DDDair/taille.ily
index f7e63d52..e7b2943a 100644
--- a/Lully/Opera/LWV71Armide/DDDair/taille.ily
+++ b/Lully/Opera/LWV71Armide/DDDair/taille.ily
@@ -1,4 +1,4 @@
-do'4 |
+\clef "taille" do'4 |
 re'4 sib4 la4 sol4 sol4 sol4 |
 fa4 la4 la2 si2 |
 do'2 do'4 do'2 fa'4 |
@@ -11,9 +11,9 @@ la'4. sol'8 fa'4 sol'8 la'8 la'4 mi'4 |
 fa'2 fa'4 re'4 re'4 re'4 |
 mi'8 re'8 mi'8 fa'8 sol'8 mi'8 fa'4 fa'4. fa'8 |
 mi'2 fa'2 fa'2 |
-sol'4. fa'8 fa'4. sol'8 mi'4. fa'8 |
+sol'4. fa'8 fa'4. sol'8 mi'4.\tr fa'8 |
 fa'4 do'2 do'2. |
 do'4 do'2 sib2 sib8 do'8 |
 do'4 do'2 re'4 re'2 |
 do'4 do'4 la4 sib8 do'8 do'4. do'8 |
-la2. ~ la2 
\ No newline at end of file
+la2.\tr ~ la2 
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/acte3.ily b/Lully/Opera/LWV71Armide/acte3.ily
index 1674fb7d..54d9a3ba 100644
--- a/Lully/Opera/LWV71Armide/acte3.ily
+++ b/Lully/Opera/LWV71Armide/acte3.ily
@@ -52,10 +52,13 @@
 \newBookPart #'(full-rehearsal)
 \pieceTocTitle "Air"
 \includeScore "DDDair"
-\pieceToc \markup {
-  La Haine, Armide :
-  \italic { Sort du sein d'Armide, Amour, brise ta chaîne } }
+%% 3-8
+\pieceToc\markup\wordwrap {
+  \smallCaps { La Haine, Armide : }
+  \italic { Sors, sors du sein d’Armide, Amour, brise ta chaîne }
+}
 \includeScore "DDEarmideHaine"
+%% 3-9
 \pieceTocTitle "Entr'acte"
 \reIncludeScore "DDDair" "DDFair"
 \actEnd \markup { FIN DU TROISIÈME ACTE }
-- 
2.11.4.GIT