From 83e1384d1f8b3d888c831b33d6e02b82a5845539 Mon Sep 17 00:00:00 2001
From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sat, 10 May 2014 12:15:42 +0200
Subject: [PATCH] =?utf8?q?Armide=20:=20acte=205=20sc=C3=A8ne=202=20[3/3]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Lully/Opera/LWV71Armide/FBCrenaud/basse.ily        | 12 +++++-----
 Lully/Opera/LWV71Armide/FBCrenaud/chiffres.ily     |  8 +++----
 Lully/Opera/LWV71Armide/FBCrenaud/global.ily       |  5 +----
 Lully/Opera/LWV71Armide/FBCrenaud/paroles.ily      | 12 +++++-----
 Lully/Opera/LWV71Armide/FBCrenaud/parts.ily        | 13 +++++++++--
 Lully/Opera/LWV71Armide/FBCrenaud/renaud.ily       | 13 -----------
 .../LWV71Armide/FBCrenaud/score-basse-continue.ily | 10 ---------
 Lully/Opera/LWV71Armide/FBCrenaud/score-voix.ily   |  6 -----
 Lully/Opera/LWV71Armide/FBCrenaud/score.ily        | 26 +++++++++++++---------
 Lully/Opera/LWV71Armide/FBCrenaud/silence.ily      |  1 -
 Lully/Opera/LWV71Armide/FBCrenaud/voix.ily         | 13 +++++++++++
 Lully/Opera/LWV71Armide/livret-acte5-raw.ily       |  2 +-
 Lully/Opera/LWV71Armide/livret.ily                 |  2 +-
 13 files changed, 59 insertions(+), 64 deletions(-)
 rewrite Lully/Opera/LWV71Armide/FBCrenaud/parts.ily (100%)
 delete mode 100644 Lully/Opera/LWV71Armide/FBCrenaud/renaud.ily
 delete mode 100644 Lully/Opera/LWV71Armide/FBCrenaud/score-basse-continue.ily
 delete mode 100644 Lully/Opera/LWV71Armide/FBCrenaud/score-voix.ily
 rewrite Lully/Opera/LWV71Armide/FBCrenaud/score.ily (82%)
 delete mode 100644 Lully/Opera/LWV71Armide/FBCrenaud/silence.ily
 create mode 100644 Lully/Opera/LWV71Armide/FBCrenaud/voix.ily

diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/basse.ily b/Lully/Opera/LWV71Armide/FBCrenaud/basse.ily
index 578f987c..4d9094ce 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/basse.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/basse.ily
@@ -1,13 +1,15 @@
-sol,8 sol8 fad8 re8 sol2 ~|
-sol8 sol8 sib8 sol8 re'4. sol8 |
-re8 mi8 fad4 sol8 fa8 mib8 re8 |
+\clef "basse" sol,8 sol8 fad8 re8 sol2~ |
+sol8 sol8 sib8 sol8 \footnoteHere #'(0 . 0) \markup\wordwrap {
+  Source : un \italic si♭ est imprimé, corrigé en \italic ré.
+} re'4. sol8 |
+re8 mi8 fad4 sol8 fa?8 mib8 re8 |
 do8 sib,8 la,8 sol,8 re8 sol,8 re,4 |
 sol,4 sol8 la8 sib2 |
 la4 si4 do'4 la8 sib8 |
 fa4 re8 sib,8 mib4 mib8 re8 |
-do8. sib,16 fa8 fa,8 sib,8 sib,16 la,16 sol,4 ~|
+do8. sib,16 fa8 fa,8 sib,8 sib,16 la,16 sol,4~ |
 sol,8 sol8 sib8 sol8 re'4. sol8 |
-re8 mi8 fad4 sol8 fa8 mib8 re8 |
+re8 mi8 fad4 sol8 fa?8 mib8 re8 |
 do8 sib,8 la,8 sol,8 re8 sol,8 re,4 |
 sol,2 sol,8 la,8 |
 sib,2. |
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/chiffres.ily b/Lully/Opera/LWV71Armide/FBCrenaud/chiffres.ily
index 2434bc74..ef2f4f24 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/chiffres.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/chiffres.ily
@@ -1,4 +1,4 @@
-<_>1 <_>2 <_+> <_+>4 <6> <_!> <6>8 <6!>
-<_->4 <6+> <_+> <_+> <_>1 <6>4 <5!> <_-> <5-> <_> <6> <_>2
-<6>1 <_>2 <_+> <_+>4 <6>8 <5!> <_!>4 <6>8 <6!>
-<_->4 <6!> <_+> <_+>
\ No newline at end of file
+s1 s2 <_+> <_+>4 <6> \naturalFig{<_+> <6>8 <6+>}
+<_->4 <6+> <_+> \new FiguredBass <_+> s1 <6>4 \naturalFig{<5->} <_-> <5-> s <6> s2
+<6>1 s2 <_+> <_+>4 <6>8 \naturalFig{<5-> <_+>4 <6>8 <6+>}
+<_->4 \naturalFig{<6+>} <_+> \new FiguredBass <_+>
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/global.ily b/Lully/Opera/LWV71Armide/FBCrenaud/global.ily
index 0eb10267..96241773 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/global.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/global.ily
@@ -1,4 +1 @@
-\oldKey re \minor
-\newKey sol \minor
-\midiTempo #80 \time 4/4 s1*11
-\digitTime\time 3/4 s2.*2
+\key re \minor \midiTempo#80 \time 4/4 s1*11 \digitTime\time 3/4 s2.*2
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/paroles.ily b/Lully/Opera/LWV71Armide/FBCrenaud/paroles.ily
index 7e9b8c7d..37c9f91f 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/paroles.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/paroles.ily
@@ -1,6 +1,6 @@
-Al -- lez, al -- lez, é -- loi -- gnez "- vous" de moi
-doux Plai -- sirs, at -- ten -- dez qu'Ar -- mi -- de vous ra -- mè -- ne.
-Sans la Beau -- té qui me tient sous sa loi
-rien ne me plait tout aug -- men -- te ma pei -- ne.
-Al -- lez, al -- lez, é -- loi -- gnez "- vous" de moi
-doux Plai -- sirs, at -- ten -- dez qu'Ar -- mi -- de vous ra -- mè -- ne.
+Al -- lez, al -- lez, é -- loi -- gnez- vous de moy
+Doux Plai -- sirs, at -- ten -- dez qu’Ar -- mi -- de vous ra -- mei -- ne :
+Sans la Beau -- té qui me tient sous sa loy
+Rien ne me plaist, tout aug -- men -- te ma pei -- ne.
+Al -- lez, al -- lez, é -- loi -- gnez- vous de moy
+Doux plai -- sirs, at -- ten -- dez qu’Ar -- mi -- de vous ra -- mei -- ne.
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/parts.ily b/Lully/Opera/LWV71Armide/FBCrenaud/parts.ily
dissimilarity index 100%
index 6a22f849..fc3c6169 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/parts.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/parts.ily
@@ -1,2 +1,11 @@
-\piecePartSpecs #`((voix)
-                   (basse-continue #:score "score-basse-continue"))
+\piecePartSpecs
+#`((basse-continue #:score-template "score-basse-continue-voix")
+   (silence #:on-the-fly-markup , #{ \markup\lyrics {
+  \bold RENAUD
+  \verse#8 { Allez, éloignez-vous de moy }
+  \verse#12 { Doux Plaisirs, attendez qu’Armide vous rameine : }
+  \verse#10 { Sans la Beauté qui me tient sous sa loy }
+  \verse#10 { Rien ne me plaist, tout augmente ma peine. }
+  \verse#8 { Allez, éloignez-vous de moy }
+  \verse#12 { Doux plaisirs, attendez qu’Armide vous rameine. }
+}#}))
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/renaud.ily b/Lully/Opera/LWV71Armide/FBCrenaud/renaud.ily
deleted file mode 100644
index 9838a9b5..00000000
--- a/Lully/Opera/LWV71Armide/FBCrenaud/renaud.ily
+++ /dev/null
@@ -1,13 +0,0 @@
-r2 r8 r16 re'16 sib8. sol16 |
-re'8. re'16 re'8 sol'8 fad'4. sol'8 |
-la'4 re'8 do'8 si4 sol'8 fa'8 |
-mib'8 re'8 do'8 sib8 la8 sib8 la4 |
-sol2 re'4 re'8 sib8 |
-fa'4 fa'8 re'8 mib'4 mib'8 re'8 |
-do'4 fa'8 fa'16 re'16 sol'4 sol'8 sib'8 |
-mib'8 mib'16 re'16 do'4 sib8. re'16 sib8. sol16 |
-re'8. re'16 re'8 sol'8 fad'4. sol'8 |
-la'4 re'8 do'8 si4 sol'8 fa'8 |
-mib'8 re'8 do'8 sib8 la8 sib8 la4 |
-sol2. |
-R2. |
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/score-basse-continue.ily b/Lully/Opera/LWV71Armide/FBCrenaud/score-basse-continue.ily
deleted file mode 100644
index ed8d1b67..00000000
--- a/Lully/Opera/LWV71Armide/FBCrenaud/score-basse-continue.ily
+++ /dev/null
@@ -1,10 +0,0 @@
-\score {
-  \new StaffGroupNoBar <<
-    \newTinyStaff \withLyrics <<
-      \global \clef "vhaute-contre" { s2 \renaudMarkNoClef } \includeNotes "renaud"
-    >> \includeLyrics "paroles"
-    \new Staff << \global \clef "basse" \includeNotes "basse"
-                  \includeFigures "chiffres" >>
-  >>
-  \layout { }
-}
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/score-voix.ily b/Lully/Opera/LWV71Armide/FBCrenaud/score-voix.ily
deleted file mode 100644
index f6e756f5..00000000
--- a/Lully/Opera/LWV71Armide/FBCrenaud/score-voix.ily
+++ /dev/null
@@ -1,6 +0,0 @@
-\score {
-  \new Staff \withLyrics <<
-    \global \clef "vhaute-contre" { s2 \renaudMarkNoClef } \includeNotes "renaud"
-  >> \includeLyrics "paroles"
-  \layout { }
-}
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/score.ily b/Lully/Opera/LWV71Armide/FBCrenaud/score.ily
dissimilarity index 82%
index a7150e7e..bde68a30 100644
--- a/Lully/Opera/LWV71Armide/FBCrenaud/score.ily
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/score.ily
@@ -1,11 +1,15 @@
-\score {
-  \new StaffGroupNoBar <<
-    \new Staff \withLyrics <<
-      \global \clef "vhaute-contre" { s2 \renaudMarkNoClef } \includeNotes "renaud"
-    >> \includeLyrics "paroles"
-    \new Staff << \global \clef "basse" \includeNotes "basse"
-                  \includeFigures "chiffres" >>
-  >>
-  \layout { }
-  \midi { }
-}
+\score {
+  \new ChoirStaff <<
+    \new Staff \withLyrics <<
+      \characterName "Renaud"
+      \global \includeNotes "voix"
+      >> \includeLyrics "paroles"
+    \new Staff \with { instrumentName = "Basse-Continue" } <<
+      \global \includeNotes "basse"
+      \includeFigures "chiffres"
+      \origLayout { s1*3\break s1*4\break s1*3\break }
+    >>
+  >>
+  \layout { indent = \largeindent }
+  \midi { }
+}
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/silence.ily b/Lully/Opera/LWV71Armide/FBCrenaud/silence.ily
deleted file mode 100644
index 8fc3bda1..00000000
--- a/Lully/Opera/LWV71Armide/FBCrenaud/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-R1*11 R2.*2
diff --git a/Lully/Opera/LWV71Armide/FBCrenaud/voix.ily b/Lully/Opera/LWV71Armide/FBCrenaud/voix.ily
new file mode 100644
index 00000000..8fbc2956
--- /dev/null
+++ b/Lully/Opera/LWV71Armide/FBCrenaud/voix.ily
@@ -0,0 +1,13 @@
+\clef "vhaute-contre" r2 r8 r16 re'16 sib8. sol16 |
+re'8. re'16 re'8 sol'8 fad'4. sol'8 |
+la'4 re'8 do'8 si4 sol'8 fa'8 |
+mib'8 re'8 do'8 sib8 la8 sib8 la4\tr |
+sol2 re'4 re'8 sib8 |
+fa'4 fa'8 re'8 mib'4 mib'8 re'8 |
+do'4\tr fa'8 fa'16 re'16 sol'4 sol'8 sib'8 |
+mib'8 mib'16 re'16 do'4\tr sib8. re'16 sib8. sol16 |
+re'8. re'16 re'8 sol'8 fad'4.\tr sol'8 |
+la'4 re'8 do'8 si4 sol'8 fa'8 |
+mib'8 re'8 do'8 sib8 la8 sib8 la4\tr |
+sol2. |
+R2. |
diff --git a/Lully/Opera/LWV71Armide/livret-acte5-raw.ily b/Lully/Opera/LWV71Armide/livret-acte5-raw.ily
index 7b23f32a..e5945629 100644
--- a/Lully/Opera/LWV71Armide/livret-acte5-raw.ily
+++ b/Lully/Opera/LWV71Armide/livret-acte5-raw.ily
@@ -125,7 +125,7 @@
 %# Pour les heureux Amants!
 \livretRef #'FBCrenaud
 \livretPers RENAUD
-%# Allez, =éloignés-vous de moy
+%# Allez, =éloignez-vous de moy
 %# Doux Plaisirs, attendez qu'Armide vous rameine:
 %# Sans la Beauté qui me tient sous sa loy
 %# Rien ne me plaist, tout augmente ma peine.
diff --git a/Lully/Opera/LWV71Armide/livret.ily b/Lully/Opera/LWV71Armide/livret.ily
index 935b75d3..9936668f 100644
--- a/Lully/Opera/LWV71Armide/livret.ily
+++ b/Lully/Opera/LWV71Armide/livret.ily
@@ -1158,7 +1158,7 @@
 \livretVerse#6 { Pour les heureux Amants ! }
 \livretRef #'FBCrenaud
 \livretPers RENAUD
-\livretVerse#8 { Allez, éloignés-vous de moy }
+\livretVerse#8 { Allez, éloignez-vous de moy }
 \livretVerse#12 { Doux Plaisirs, attendez qu’Armide vous rameine : }
 \livretVerse#10 { Sans la Beauté qui me tient sous sa loy }
 \livretVerse#10 { Rien ne me plaist, tout augmente ma peine. }
-- 
2.11.4.GIT