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

---
 Lully/Opera/LWV71Armide/DDBritournelle/silence.ily |  1 -
 Lully/Opera/LWV71Armide/DDChaine/basse.ily         |  8 +-
 Lully/Opera/LWV71Armide/DDChaine/chiffres.ily      | 26 +++----
 Lully/Opera/LWV71Armide/DDChaine/dessus.ily        | 30 ++++----
 Lully/Opera/LWV71Armide/DDChaine/global.ily        |  6 +-
 Lully/Opera/LWV71Armide/DDChaine/haine.ily         | 13 ----
 Lully/Opera/LWV71Armide/DDChaine/haute-contre.ily  | 16 ++--
 .../Opera/LWV71Armide/DDChaine/paroles-choeur1.ily | 14 ----
 .../Opera/LWV71Armide/DDChaine/paroles-choeur2.ily | 14 ----
 Lully/Opera/LWV71Armide/DDChaine/paroles.ily       | 30 ++++++--
 Lully/Opera/LWV71Armide/DDChaine/parts.ily         |  4 +-
 Lully/Opera/LWV71Armide/DDChaine/quinte.ily        | 15 ++--
 Lully/Opera/LWV71Armide/DDChaine/score-voix.ily    | 20 -----
 Lully/Opera/LWV71Armide/DDChaine/score.ily         | 89 ++++++++++++++--------
 Lully/Opera/LWV71Armide/DDChaine/silence.ily       |  1 -
 Lully/Opera/LWV71Armide/DDChaine/taille.ily        | 12 +--
 Lully/Opera/LWV71Armide/DDChaine/voix-basse.ily    | 14 ++--
 .../LWV71Armide/DDChaine/voix-haute-contre.ily     | 20 ++---
 Lully/Opera/LWV71Armide/DDChaine/voix-taille1.ily  | 18 ++---
 Lully/Opera/LWV71Armide/DDChaine/voix-taille2.ily  | 30 --------
 Lully/Opera/LWV71Armide/DDChaine/voix.ily          | 41 ++++++++++
 Lully/Opera/LWV71Armide/acte3.ily                  | 10 ++-
 22 files changed, 217 insertions(+), 215 deletions(-)
 delete mode 100644 Lully/Opera/LWV71Armide/DDBritournelle/silence.ily
 rewrite Lully/Opera/LWV71Armide/DDChaine/chiffres.ily (99%)
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/haine.ily
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/paroles-choeur1.ily
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/paroles-choeur2.ily
 rewrite Lully/Opera/LWV71Armide/DDChaine/paroles.ily (100%)
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/score-voix.ily
 rewrite Lully/Opera/LWV71Armide/DDChaine/score.ily (94%)
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/silence.ily
 delete mode 100644 Lully/Opera/LWV71Armide/DDChaine/voix-taille2.ily
 create mode 100644 Lully/Opera/LWV71Armide/DDChaine/voix.ily

diff --git a/Lully/Opera/LWV71Armide/DDBritournelle/silence.ily b/Lully/Opera/LWV71Armide/DDBritournelle/silence.ily
deleted file mode 100644
index 19b6bbeb..00000000
--- a/Lully/Opera/LWV71Armide/DDBritournelle/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-r2 R1*5 R1 R1 R1*11 R1 r2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/basse.ily b/Lully/Opera/LWV71Armide/DDChaine/basse.ily
index d3e58483..91080bd1 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/basse.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/basse.ily
@@ -1,20 +1,20 @@
-fa,2 fa4. fa8 |
+\clef "basse" fa,2 fa4. fa8 |
 la,4 fa8 mib8 re8. mib16 re8 do8 |
 sib,4. sib,8 do4. do8 |
 re2 re8. mi16 fa4 |
 mi4 re8 sol8 do8. re16 mi8 do8 |
 fa8 mib8 re8 sib,8 mib8 re8 mib8 do8 |
 re8 mib8 re8 do8 sib,8 la,8 sib,8 sol,8 |
-do8 re8 mib8 do8 re4 ( do4 )|
+do8 re8 mib8 do8 re4 do4 |
 sib,8 la,16 sol,16 re8 re,8 sol,4 sol8 fa8 |
 mi8 re8 do8 sib,8 la,8 sol,8 fa,4 |
-do4 ( sib,4 ) la,8 sol,16 fa,16 do8 do,8 |
+do4 sib,4 la,8 sol,16 fa,16 do8 do,8 |
 fa,4. fa8 fa2 |
 sib4 sib8 sib8 sol2 |
 re'4. la8 sib4 sol8 do'8 |
 fa2 fa16 fa16 fa16 mi16 re8 re16 do16 |
 sol2 sol16 sol16 mi16 mi16 la8 fa16 sol16 |
-do2. ~ do2 do'4 |
+do2.^\viste ~ do2 do'4 |
 fa4 fa4 fa4 sib4 sib4 sol4 |
 la4 re'2 sib4 sib2 |
 fad4 fad4 sol4 mib2 do4 |
diff --git a/Lully/Opera/LWV71Armide/DDChaine/chiffres.ily b/Lully/Opera/LWV71Armide/DDChaine/chiffres.ily
dissimilarity index 99%
index d08ef767..8fd7d603 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/chiffres.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/chiffres.ily
@@ -1,13 +1,13 @@
-<_>1 <6>2 <6> <_> <4>4 <3> <_>1 <6>4 <7>8 <_!> <_>2
-
-<_>4 <6> <_>4. <_->8 <_+>2 <6> <_->4 <4! 6> <_+>2 <6>8 <6+> <_>4 <_->2
-<6>2 <6> <_> <6>8 <6> <_>4
-%%
-<_>1 <_>1*2 <_>2. <7>8 <6!>
-<_!>2. <_>8. <_!>16 <_>1. <_>2. <_>2 <6>4 <_> <_+>2 <6>2.
-<5!>2. <_>2 <6>4 <_+> <6> <6+> <_>2. <_>1. <_>2. <6!>
-<_!>2 <6!> <_!> <_>2. <5> <_> <5-> <_>1.
-<_>1. <_>2. <_>2 <4! 6>4 <_+>1. <_>2. <6>
-<_>2 <6>1 <_>1.*2 <_>2. <6> <_>4 <6> <6> <_>2.
-<_>1. <_-> <_-> <_>4 <6>2 <5->2.
-<_>2. <6>
\ No newline at end of file
+s1 <6>2 <6> s <4>4 <3> s1 <6>4 <7>8 \naturalFig{<_+>} s2
+
+s4 <6> s4. <_->8 <_+>2 <6> <_->4 \naturalFig{<6 4+>} <_+>4\figExtOn <_+>\figExtOff <6>8 <6+> s4 <_->2
+<6>2 <6> <"">4\figExtOn <"">\figExtOff <6>8 <6> s4
+%%
+s1 s1*2 s2. <7>8 \naturalFig{<6+>}
+\naturalFig{<_+>2. s8. <_+>16} s1. s2. s2 <6>4 s <_+>2 <6>2.
+\naturalFig{<5->2.} s2 <6>4 <_+> <6> <6+> s2. s1. s2. \naturalFig{<6+>}
+\naturalFig{<_+>2 <6+> <_+>} s2. <5> s <5-> s1.
+s1. s2. s2 \naturalFig{<6 4+>4} <_+>1. s2. <6>
+s2 <6>1 s1.*2 s2. <6> s4 <6> <6> s2.
+s1. <_-> \naturalFig{<_->} s4 <6>2 <5->2.
+s2. <6>
diff --git a/Lully/Opera/LWV71Armide/DDChaine/dessus.ily b/Lully/Opera/LWV71Armide/DDChaine/dessus.ily
index 34f94d0b..070b4b17 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/dessus.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/dessus.ily
@@ -1,42 +1,42 @@
-r4 r8 la'8 la'2 |
+\clef "dessus" r4\doux r8 la'8 la'2 |
 la'4 la'8 do''8 fa'2 |
-fa'4. fa'8 fa'4 mi'8. fa'16 |
+fa'4. fa'8 fa'4 mi'8.\tr fa'16 |
 fa'2 fa''4 do''8 re''8 |
-mi''8 do''8 fa''8 sol''8 mi''2 |
+mi''8 do''8 fa''8 sol''8 mi''2\tr |
 do''8 do''8 re''8 re''8 sib'4 sib'8 do''8 |
 la'2 sib'4. sib'8 |
-do''4 do''8 la'8 la'8 fad'8 fad'4 |
-sol'8 la'16 sib'16 la'8. sol'16 sol'2 |
+do''4 do''8 la'8 la'8 fad'8 fad'4\tr |
+sol'8 la'16 sib'16 la'8.\tr sol'16 sol'2 |
 sol'2 la'4 la'8 la'8 |
-sol'8 mi'8 mi'4 fa'8 sol'16 la'16 sol'8. fa'16 |
+sol'8 mi'8 mi'4\tr fa'8 sol'16 la'16 sol'8. fa'16 |
 fa'4. fa'8 fa'2 |
 fa'4 fa'8 fa'8 sib'2 |
 la'4. la'8 fa'4 sib'8 sol'8 |
 la'2 la'16 la'16 la'16 sol'16 fa'8 fa'16 mi'16 |
 re'2 re'16 re'16 sol'16 sol'16 mi'8 fa'16 re'16 |
-mi'2. r2 sol'4 |
+mi'2.^\viste r4 r sol'4 |
 la'4 la'4 la'4 fa'4 fa'4 sib'4 |
 la'4 la'2 sib'4 sib'2 |
 la'4 la'4 re'4 mib'2 mib'4 |
 re'4 sol'4 la'4 sib'4 fad'4. sol'8 |
 sol'4 sib'2 sol'4 sol'2 |
 la'4 la'4 sol'4 fa'2 mi'4 |
-re'4 sol'4 fa'4 mi'4 re'4. sol'8 |
+re'4 sol'4 fa'4 mi'4 re'4.\tr sol'8 |
 mi'4 sol'2 la'4 la'2 |
 la'4 sib'4 sib'4 sol'2 fa'4 |
-fa'4 fa'4 fa'4 sol'4 mi'4. fa'8 |
+fa'4 fa'4 fa'4 sol'4 mi'4.\tr fa'8 |
 fa'4 la'4 la'4 re''4 re''8 mib''8 re''8 do''8 |
 sib'4 sib'4 sib'4 mib''8 re''8 do''8 sib'8 la'8 sol'8 |
 fad'4 la'4 la'4 sib'4 sib'8 do''8 sib'8 la'8 |
 sol'4 sol'4 sol'4 do''4 do''8 sib'8 la'8 sol'8 |
-fa'2 fa'2 mi'4. re'16 mi'16 |
+fa'2 fa'2 mi'4.\tr re'16 mi'16 |
 fa'4 la'4 la'4 fa'4 fa'4 sib'4 |
 sol'4 sol'2 la'4 la'2 |
 fa'4 fa'4 fa'4 fa'2 sib'4 |
-sol'4 fa'4 mib'4 re'4 do'4. fa'8 |
-re'4 fa'2 fa'4 la'4 la'8 sib'8 |
+sol'4 fa'4 mib'4 re'4 do'4.\tr fa'8 |
+re'4\tr fa'2 fa'4 la'4 la'8 sib'8 |
 sol'4 sol'2 sol'4 sib'4 sib'8 do''8 |
 la'4 la'2 sib'4 sib'4 sib'4 |
-sol'4 fa'4 fa'4 sol'2 la'4 |
-fa'4 fa'4 fa'4 sol'4 mi'4. fa'8 |
-fa'2. ~ fa'2 
\ No newline at end of file
+sol'4\tr fa'4 fa'4 sol'2 la'4 |
+fa'4 fa'4 fa'4 sol'4 mi'4.\tr fa'8 |
+fa'2.~ fa'2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/global.ily b/Lully/Opera/LWV71Armide/DDChaine/global.ily
index c9f98edd..c600fa5d 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/global.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/global.ily
@@ -1,3 +1,3 @@
-\keys fa \major
-\midiTempo #80 \digitTime \time 2/2 s1*16
-\midiTempo #160 \time 6/4 s1.*25 s2. s2 \bar "|."
+\key fa \major
+\midiTempo#80 \digitTime\time 2/2 s1*11 s1*5
+\midiTempo#160 \time 6/4 s1.*25 s2. s2 \bar "|."
diff --git a/Lully/Opera/LWV71Armide/DDChaine/haine.ily b/Lully/Opera/LWV71Armide/DDChaine/haine.ily
deleted file mode 100644
index 8d2c0713..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/haine.ily
+++ /dev/null
@@ -1,13 +0,0 @@
-r4 r8 \haineMarkNoClef do'8 do'2 |
-fa'4 la8 la8 sib2 |
-re'4. re'8 sol4 sol8 do'8 |
-fa4 fa4 fa8. sol16 la8 si8 |
-do'4 do'8 si8 do'4 do'4 |
-la8 la8 sib8 re'8 sol4 sol8 la8 |
-fad2 re'2 |
-mib'4 la8 do'8 fad8 re8 la4 |
-sib8 do'16 re'16 fad8. sol16 sol2 |
-do'2 fa'4 la8 do'8 |
-mi8 do8 sol4 la8 sib16 do'16 mi8. fa16 |
-fa4. r8 r2 |
-R1*4 R1.*25
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDChaine/haute-contre.ily b/Lully/Opera/LWV71Armide/DDChaine/haute-contre.ily
index ddaec238..874566be 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/haute-contre.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/haute-contre.ily
@@ -1,9 +1,11 @@
-r4 r8 fa'8 fa'2 |
+\clef "haute-contre" r4\doux r8 fa'8 fa'2 |
 fa'4 fa'8 do'8 re'2 |
 re'4. re'8 do'4. do'8 |
 fa'2 fa'4 fa'4 |
 sol'4 la'8 sol'8 sol'2 |
-la'4 fa'8 sib'8 sib'4 sib'8 la'8 |
+\footnoteHere #'(0 . 0) \markup\wordwrap {
+  Source : un \italic sol est imprimé, corrigé en \italic la.
+} la'4 fa'8 sib'8 sib'4 sib'8 la'8 |
 la'2 sol'4. sol'8 sol'4 mib'8 mib'8 la2 |
 sol8 do'16 sib16 re'8. re'16 re'2 |
 mi'2 do'2 |
@@ -13,12 +15,12 @@ re'4 re'8 re'8 sol'2 |
 fa'4. fa'8 re'4 re'8 mi'8 |
 fa'2 fa'16 fa'16 fa'16 do'16 do'8 si16 do'16 |
 si2 si16 si16 mi'16 mi'16 do'8 do'16 si16 |
-do'2. r2 mi'4 |
+do'2.^\viste r4 r mi'4 |
 fa'4 fa'4 fa'4 re'4 re'4 sol'4 |
 mi'4 fad'2 sol'4 sol'2 |
 do'4 do'4 sib4 sib2 do'4 |
 la4 sib4 do'4 re'4 re'4. re'8 |
-re'4 sol'2 mi'4 mi'2 |
+re'4 sol'2 mi'4 mi'2\tr |
 fa'4 fa'4 do'4 si2 do'4 |
 re'4 mi'4 si4 do'8. re'16 re'4. do'8 |
 do'4 mi'2 mi'4 mi'2 |
@@ -32,10 +34,10 @@ la2 sib2 sol4 do'4 |
 la4 do'4 fa'4 re'4 re'4 sol'4 |
 mi'4 mi'2 fa'4 fa'2 |
 re'4 re'4 re'4 re'2 re'4 |
-sib4 re'4 la4 sib8. do'16 do'4. sib8 |
+sib4 re'4 la4 sib8. do'16 do'4.\tr sib8 |
 sib4 re'2 do'4 do'4 do'8 re'8 |
-mib'4 mib'2 re'4 re'4 re'8 mi'8 |
+mib'4 mib'2 re'4 re'4 re'8 mi'?8 |
 fa'4 fa'2 fa'4 sol'4 sol'4 |
 mi'4 fa'4 do'4 do'2 do'4 |
 re'4 re'4 re'4 re'4 do'4. do'8 |
-la2. ~ la2 
\ No newline at end of file
+la2.~ la2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur1.ily b/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur1.ily
deleted file mode 100644
index 0b0fc0fc..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur1.ily
+++ /dev/null
@@ -1,14 +0,0 @@
-A -- mour, sors pour ja -- mais, sors d'un cœur qui te chas -- se,
-que la Hai -- ne règne en ta pla -- ce,
-que la Hai -- ne règne en ta pla -- ce.
-
-Tu fais trop souf -- frir sous ta loi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi.
-
-Tu fais trop souf -- frir sous ta loi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, 
-non, non, 
-non, non, tout l'En -- fer tout l'En -- fer n'a rien de si cru -- el que toi.
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur2.ily b/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur2.ily
deleted file mode 100644
index 5d222902..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/paroles-choeur2.ily
+++ /dev/null
@@ -1,14 +0,0 @@
-A -- mour, sors pour ja -- mais, sors d'un cœur qui te chas -- se,
-que la Hai -- ne règne en ta pla -- ce,
-que la Hai -- ne règne en ta pla -- ce.
-
-Tu fais trop souf -- frir sous ta loi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi.
-
-Tu fais trop souf -- frir sous ta loi,
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, 
-non, non, 
-non, non, non, non, tout l'En -- fer n'a rien de si cru -- el que toi.
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDChaine/paroles.ily b/Lully/Opera/LWV71Armide/DDChaine/paroles.ily
dissimilarity index 100%
index e2d570c7..97f05955 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/paroles.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/paroles.ily
@@ -1,5 +1,25 @@
-A -- mour, sors pour ja -- mais, sors d'un cœur qui te chas -- se,
-lais -- se "- moi" ré -- gner en ta pla -- ce.
-Tu fais trop souf -- frir sous ta loi,
-non, non, tout l'En -- fer n'a rien de si cru -- el que toi,
-non, non, tout l'En -- fer n'a rien de si cru -- el que toi.
+\tag #'haine {
+  A -- mour, sors pour ja -- mais, sors d’un cœur qui te chas -- se :
+  Lais -- se- moy re -- gner en ta pla -- ce.
+  Tu faits trop souf -- frir sous ta loy,
+  Non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+  Non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+}
+\tag #'(vhaute-contre vtaille1 vtaille2 vbasse) {
+  A -- mour, sors pour ja -- mais, sors d’un cœur qui te chas -- se :
+  Que la Hai -- ne regne en ta pla -- ce.
+  Que la Hai -- ne regne en ta pla -- ce.
+  Tu faits trop souf -- frir sous ta loy,
+  Non, non, non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+  Non, non, non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+  Non, non, non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+  Tu faits trop souf -- frir sous ta loy.
+  Non, non, non, non, tout l’En -- fer n’a rien de si cru -- el que toy.
+  Non, non,
+  Non, non,
+  Non, non,
+  \tag #'(vhaute-contre vtaille1) { tout l’En -- fer }
+  \tag #'(vtaille2 vbasse) { non, non, }
+  tout l’En -- fer n’a rien de si cru -- el que toy.
+}
+
diff --git a/Lully/Opera/LWV71Armide/DDChaine/parts.ily b/Lully/Opera/LWV71Armide/DDChaine/parts.ily
index 17730778..09d921fc 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/parts.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/parts.ily
@@ -1,8 +1,6 @@
-\piecePartSpecs #`((dessus1)
-                   (dessus2)
+\piecePartSpecs #`((dessus)
                    (haute-contre)
                    (taille)
                    (quinte)
                    (basse)
-                   (voix)
                    (basse-continue))
diff --git a/Lully/Opera/LWV71Armide/DDChaine/quinte.ily b/Lully/Opera/LWV71Armide/DDChaine/quinte.ily
index 1b790ea3..5ef0c659 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/quinte.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/quinte.ily
@@ -1,4 +1,4 @@
-r4 r8 fa8 fa2 |
+\clef "quinte" r4\douxSug r8 fa8 fa2 |
 do4 fa4 fa2 |
 re4. re8 do4 mi8 mi8 |
 re2 la4 la8 re'8 |
@@ -8,13 +8,16 @@ re2 sol4. sol8 |
 mib4 mib8 mib8 re2 |
 re8 do16 sol16 la8 re8 re4 sol4 |
 sol2 fa4. do8 |
+\footnoteHere #'(0 . 0) \markup\wordwrap {
+  Source : un \italic mi est imprimé, corrigé en \italic do.
+}
 do2 do8 sol16 do16 do8. do16 |
-do4. la8 do'2 |
+mi4. la8 do'2 |
 sib4 sib8 sib8 sib2 |
 re'4. fa'8 fa'4 sol'8 sol'8 |
 fa'2 la16 la16 la16 la16 la8 re16 mi16 |
 sol2 sol16 sol16 sol16 sol16 la8 re'16 re'16 |
-do'2. r2 do'4 |
+do'2.^\viste r4 r do'4 |
 la4 la4 la4 sib4 re'4 mi'4 |
 mi'4 re'2 re'4 sib2 |
 do'4 la4 sol4 sib2 la4 |
@@ -37,6 +40,6 @@ sol4 sib4 mib8 do8 re8. mib16 fa4. fa8 |
 fa4 sib2 do'4 do'4 fa4 |
 sol4 do'2 re'4 sol'4 sol'4 |
 fa'4 fa'2 re'4 sib2 |
-do'4 do'4 la4 sol2 fa4 |
-fa4 fa4 la4 sol4 sol4. fa8 |
-fa2. ~ fa2 
\ No newline at end of file
+do'4 do'4 la4 sol2\tr fa4 |
+fa4 fa4 la4 sol4 sol4.\tr fa8 |
+fa2.~ fa2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/score-voix.ily b/Lully/Opera/LWV71Armide/DDChaine/score-voix.ily
deleted file mode 100644
index 9b0dbead..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/score-voix.ily
+++ /dev/null
@@ -1,20 +0,0 @@
-\score {
-  \new ChoirStaff <<
-    \newHaraKiriStaffB \withLyrics <<
-      \global \clef "vhaute-contre" \includeNotes "voix-haute-contre"
-    >> \includeLyrics "paroles-choeur1"
-    \newHaraKiriStaffB \withLyrics <<
-      \global \clef "vtaille" \includeNotes "voix-taille1"
-    >> \includeLyrics "paroles-choeur1"
-    \newHaraKiriStaffB \withLyrics <<
-      \global \clef "vtaille" \includeNotes "voix-taille2"
-    >> \includeLyrics "paroles-choeur2"
-    \newHaraKiriStaffB \withLyrics <<
-      \global \clef "vbasse" \includeNotes "voix-basse"
-    >> \includeLyrics "paroles-choeur2"
-    \newHaraKiriStaff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "haine"
-    >> \includeLyrics "paroles"
-  >>
-  \layout { }
-}
diff --git a/Lully/Opera/LWV71Armide/DDChaine/score.ily b/Lully/Opera/LWV71Armide/DDChaine/score.ily
dissimilarity index 94%
index 2cb20f82..d927d0fc 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/score.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/score.ily
@@ -1,31 +1,58 @@
-\score {
-  \new StaffGroupNoBar <<
-    \new StaffGroupNoBracket <<
-      \newHaraKiriStaff << \global \clef "dessus" \includeNotes "dessus" >>
-      \newHaraKiriStaff << \global \clef "haute-contre" \includeNotes "haute-contre" >>
-      \newHaraKiriStaff << \global \clef "taille" \includeNotes "taille" >>
-      \newHaraKiriStaff << \global \clef "quinte" \includeNotes "quinte" >>
-    >>
-    \new ChoirStaff <<
-      \newHaraKiriStaffB \withLyrics <<
-        \global \clef "vhaute-contre" \includeNotes "voix-haute-contre"
-      >> \includeLyrics "paroles-choeur1"
-      \newHaraKiriStaffB \withLyrics <<
-        \global \clef "vtaille" \includeNotes "voix-taille1"
-      >> \includeLyrics "paroles-choeur1"
-      \newHaraKiriStaffB \withLyrics <<
-        \global \clef "vtaille" \includeNotes "voix-taille2"
-      >> \includeLyrics "paroles-choeur2"
-      \newHaraKiriStaffB \withLyrics <<
-        \global \clef "vbasse" \includeNotes "voix-basse"
-      >> \includeLyrics "paroles-choeur2"
-    >>
-    \newHaraKiriStaff \withLyrics <<
-      \global \clef "vtaille" \includeNotes "haine"
-    >> \includeLyrics "paroles"
-    \new Staff << \global \clef "basse" \includeNotes "basse"
-                  \includeFigures "chiffres" >>
-  >>
-  \layout { }
-  \midi { }
-}
+\score {
+  \new StaffGroupNoBar <<
+    \modVersion\new StaffGroupNoBracket <<
+      \new Staff << \global \includeNotes "dessus" >>
+      \new Staff << \global \includeNotes "haute-contre" >>
+      \new Staff << \global \includeNotes "taille" >>
+      \new Staff << \global \includeNotes "quinte" >>
+      \new Staff \with { \haraKiriFirst } <<
+        { \startHaraKiri s1*11 \stopHaraKiri }
+        \global \includeNotes "basse"
+      >>
+    >>
+    <<
+      \new Staff \with { \haraKiriFirst } \withLyrics <<
+        \global \includeNotes "voix-haute-contre"
+      >> \keepWithTag #'vhaute-contre \includeLyrics "paroles"
+      \new Staff \with { \haraKiriFirst } \withLyrics <<
+        \global \includeNotes "voix-taille1"
+      >> \keepWithTag #'vtaille1 \includeLyrics "paroles"
+      \new Staff \with { \haraKiri } \withLyrics <<
+        { \noHaraKiri s1*11 \revertNoHaraKiri }
+        \characterName "La Haine"
+        \global \includeNotes "voix"
+      >> \keepWithTag #'(haine vtaille2) \includeLyrics "paroles"
+      \new Staff \with { \haraKiriFirst } \withLyrics <<
+        \global \includeNotes "voix-basse"
+      >> \keepWithTag #'vbasse \includeLyrics "paroles"
+    >>
+    \origVersion <<
+      \new Staff << \global \includeNotes "dessus" >>
+      \new Staff << \global \includeNotes "haute-contre" >>
+      \new Staff << \global \includeNotes "taille" >>
+      \new Staff << \global \includeNotes "quinte" >>
+      \new Staff \with { \haraKiriFirst } <<
+        { \startHaraKiri s1*11 \stopHaraKiri }
+        \global \includeNotes "basse"
+      >>
+    >>
+    \new Staff \with { instrumentName = "Basse-Continue" } <<
+      \global \includeNotes "basse"
+      \includeFigures "chiffres"
+      \origLayout {
+        s1*5\pageBreak s1*4\break s1*2\pageBreak
+        s1*4\pageBreak s1 s1.*3\pageBreak s1.*4\pageBreak
+        s1.*4\pageBreak s1.*4\pageBreak s1.*5\pageBreak
+        s1.*4\pageBreak
+      }
+      \modVersion {
+        s1*11\pageBreak
+        \override Score.NonMusicalPaperColumn.page-break-permission = ##f
+        s1*5 s1.*3\pageBreak
+        s1.*8\pageBreak s1.*8\pageBreak
+      }
+    >>
+  >>
+  \layout { indent = \largeindent }
+  \midi { }
+}
diff --git a/Lully/Opera/LWV71Armide/DDChaine/silence.ily b/Lully/Opera/LWV71Armide/DDChaine/silence.ily
deleted file mode 100644
index 4d75bf01..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/silence.ily
+++ /dev/null
@@ -1 +0,0 @@
-R1*16 R1.*25 r2. r2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/taille.ily b/Lully/Opera/LWV71Armide/DDChaine/taille.ily
index d31a9ee6..e106f5da 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/taille.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/taille.ily
@@ -1,7 +1,7 @@
-r4 r8 la8 la2 |
+\clef "taille" r4\douxSug r8 la8 la2 |
 do'4 do'8 do'8 sib2 |
 sib4. sib8 sib8 la8 sol8 sol16 do'16 |
-la2 la'4 la'4 |
+la2\tr la'4 la'4 |
 sol'8 mi'8 fa'8 re'8 mi'2 |
 fa'4. fa'8 sol'4 sol4 |
 re'2 re'4. sib8 |
@@ -14,14 +14,14 @@ sib4 sib8 re'8 re'2 |
 re'4. do'8 sib4 sib8 do'8 |
 do'2 do'16 do'16 do'16 do'16 re'8 re'16 sol16 |
 sol2 si16 si16 si16 si16 la8 la16 sol16 |
-sol2. r2 do'4 |
+sol2.^\viste r4 r do'4 |
 do'4 do'4 do'4 sib4 fa'4 mi'4 |
 dod'4 re'2 re'4 re'2 |
 re'4 re'4 re'4 sol2 la4 |
 la4 sol4 fad4 sol4 la4. sib8 |
 sib4 re'2 do'4 do'2 |
 do'4 do'4 do'4 re'2 mi'4 |
-si4 do'4 re'4 la8 do'8 si4. do'8 |
+si4 do'4 re'4 sol8*3/2 do'8*1/2 si4. do'8 |
 do'4 do'2 do'4 do'2 |
 re'4 re'4 re'4 do'2 do'4 |
 fa4 la4 la4 sib4 sol4 do'4 |
@@ -33,10 +33,10 @@ la4 fa4 fa2 do'4. do'8 |
 do'4 do'4 do'4 sib4 re'4 re'4 |
 do'4 do'2 do'4 do'2 |
 sib4 sib4 sib4 sib2 sib4 |
-sib4 sib4 do'4 fa8 sib8 la4. sib8 |
+sib4 sib4 do'4 fa8 sib8 la4.\tr sib8 |
 sib4 sib2 la4 la4 do'4 |
 do'4 do'2 sib4 sib4 re'4 |
 re'4 re'2 re'4 re'2 |
 do'4 do'4 do'4 sib2 la4 |
 la4 la4 la4 sib4 sol4 do'4 |
-do'2. ~ do'2 
\ No newline at end of file
+do'2.~ do'2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/voix-basse.ily b/Lully/Opera/LWV71Armide/DDChaine/voix-basse.ily
index f1464234..276fe847 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/voix-basse.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/voix-basse.ily
@@ -1,10 +1,10 @@
-R1*11 |
+\clef "vbasse" R1*11 |
 r4 r8 fa8 fa2 |
 sib4 sib8 sib8 sol2 |
 re'4. la8 sib4 sol8 do'8 |
 fa4 fa4 fa16 fa16 fa16 mi16 re8 re16 do16 |
 sol4 sol4 sol16 sol16 mi16 mi16 la8 fa16 sol16 |
-do2 do4 r2 do'4 |
+do2^\viste do4 r r do'4 |
 fa4 fa4 fa4 sib4 sib4 sol4 |
 la4 re'2 sib4 sib2 |
 fad4 fad4 sol4 mib2 do4 |
@@ -15,16 +15,16 @@ sol4 mi4 re4 do4 sol4. sol8 |
 do4 do'2 la4 la2 |
 re'4 sib4 sol4 mi2 fa4 |
 re4 re4 re4 sib,4 do4. do8 |
-fa,2. r2. |
+fa,2. r2*3/2 |
 R1.*3 |
-r2. r2 do4 |
+r2*3/2 r4 r do4 |
 fa4 fa4 fa4 sib4 sib4 sol4 |
 do'4 do'2 fa4 fa2 |
 sib4 sib4 sib4 re2 re4 |
 mib4 re4 do4 sib,4 fa4. fa8 |
-sib,4 sib2 fa4 r2 |
-r4 do'2 sol4 r2 |
+sib,4 sib2 fa4 r r |
+r4 do'2 sol4 r r |
 r4 re'2 sib4 sol2 |
 do'4 la4 la4 mi2 fa4 |
 re4 re4 re4 sib,4 do4. do8 |
-fa,2. ~ fa,2 
\ No newline at end of file
+fa,2.~ fa,2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/voix-haute-contre.ily b/Lully/Opera/LWV71Armide/DDChaine/voix-haute-contre.ily
index def25ceb..bfa0840b 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/voix-haute-contre.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/voix-haute-contre.ily
@@ -1,10 +1,10 @@
-R1*11 |
+\clef "vhaute-contre" R1*11 |
 r4 r8 fa'8 fa'2 |
 fa'4 fa'8 fa'8 sib'2 |
 la'4. la'8 fa'4 sib'8 sol'8 |
 la'4 la'4 la'16 la'16 la'16 sol'16 fa'8 fa'16 mi'16 |
 re'4 re'4 re'16 re'16 sol'16 sol'16 mi'8 fa'16 re'16 |
-mi'2 mi'4 r2 sol'4 |
+mi'2^\viste mi'4 r4 r sol'4 |
 la'4 la'4 la'4 fa'4 fa'4 sib'4 |
 la'4 la'2 sib'4 sib'2 |
 la'4 la'4 re'4 mib'2 mib'4 |
@@ -14,17 +14,17 @@ la'4 la'4 sol'4 fa'2 mi'4 |
 re'4 sol'4 fa'4 mi'4 re'4. sol'8 |
 mi'4 sol'2 la'4 la'2 |
 la'4 sib'4 sib'4 sol'2 fa'4 |
-fa'4 fa'4 fa'4 sol'4 mi'4. fa'8 |
-fa'2. r2. |
+fa'4 fa'4 fa'4 sol'4 mi'4.\tr fa'8 |
+fa'2. r2*3/2 |
 R1.*3 |
-r2. r2 sol'4 |
+r2*3/2 r4 r sol'4 |
 la'4 la'4 la'4 fa'4 fa'4 sib'4 |
 sol'4 sol'2 la'4 la'2 |
 fa'4 fa'4 fa'4 fa'2 sib'4 |
 sol'4 fa'4 mib'4 re'4 do'4. fa'8 |
-re'4 fa'2 fa'4 r2 |
-r4 sol'2 sol'4 r2 |
+re'4 fa'2 fa'4 r r |
+r4 sol'2 sol'4 r r |
 r4 la'2 sib'4 sib'4 sib'4 |
-sol'4 fa'4 fa'4 sol'2 la'4 |
-fa'4 fa'4 fa'4 sol'4 mi'4. fa'8 |
-fa'2. ~ fa'2 
\ No newline at end of file
+sol'4\tr fa'4 fa'4 sol'2 la'4 |
+fa'4 fa'4 fa'4 sol'4 mi'4.\tr fa'8 |
+fa'2.~ fa'2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/voix-taille1.ily b/Lully/Opera/LWV71Armide/DDChaine/voix-taille1.ily
index 85f6c50c..765a852a 100644
--- a/Lully/Opera/LWV71Armide/DDChaine/voix-taille1.ily
+++ b/Lully/Opera/LWV71Armide/DDChaine/voix-taille1.ily
@@ -1,10 +1,10 @@
-R1*11 |
+\clef "vtaille" R1*11 |
 r4 r8 do'8 do'2 |
 re'4 re'8 re'8 sol'2 |
 fa'4. fa'8 re'4 re'8 mi'8 |
 fa'4 fa'4 fa'16 fa'16 fa'16 do'16 do'8 si16 do'16 |
 si4 si4 si16 si16 mi'16 mi'16 do'8 do'16 si16 |
-do'2 do'4 r2 mi'4 |
+do'2^\viste do'4 r r mi'4 |
 fa'4 fa'4 fa'4 re'4 re'4 sol'4 |
 mi'4 fad'2 sol'4 sol'2 |
 do'4 do'4 sib4 sib2 do'4 |
@@ -15,16 +15,16 @@ re'4 mi'4 si4 do'4 si4. do'8 |
 do'4 mi'2 mi'4 mi'2 |
 fa'4 fa'4 sib4 sib2 la4 |
 re'4 re'4 re'4 re'4 do'4. do'8 |
-la2. r2. |
+la2. r2*3/2 |
 R1.*3 |
-r2. r2 mi'4 |
+r2*3/2 r4 r mi'4 |
 fa'4 fa'4 fa'4 re'4 re'4 sol'4 |
 mi'4 mi'2 fa'4 fa'2 |
 re'4 re'4 re'4 re'2 re'4 |
-sib4 re'4 la4 sib4 la4. sib8 |
-sib4 re'2 do'4 r2 |
-r4 mib'2 re'4 r2 |
+sib4 re'4 la4 sib4 la4.\tr sib8 |
+sib4 re'2 do'4 r r |
+r4 mib'2 re'4 r r |
 r4 fa'2 fa'4 sol'4 sol'4 |
-mi'4 fa'4 do'4 do'2 do'4 |
+mi'4\tr fa'4 do'4 do'2 do'4 |
 re'4 re'4 re'4 re'4 do'4. do'8 |
-la2. ~ la2 
\ No newline at end of file
+la2.\tr~ la2
diff --git a/Lully/Opera/LWV71Armide/DDChaine/voix-taille2.ily b/Lully/Opera/LWV71Armide/DDChaine/voix-taille2.ily
deleted file mode 100644
index c3c3838d..00000000
--- a/Lully/Opera/LWV71Armide/DDChaine/voix-taille2.ily
+++ /dev/null
@@ -1,30 +0,0 @@
-R1*11 |
-r4 r8 la8 la2 |
-sib4 sib8 re'8 re'2 |
-re'4. do'8 sib4 sib8 do'8 |
-do'4 do'4 do'16 do'16 do'16 do'16 re'8 re'16 sol16 |
-sol4 sol4 si16 si16 si16 si16 la8 la16 sol16 |
-sol2 sol4 r2 do'4 |
-do'4 do'4 do'4 sib4 fa'4 mi'4 |
-dod'4 re'2 re'4 re'2 |
-re'4 re'4 re'4 sol2 la4 |
-fad4 re4 fad4 sol4 la4. sib8 |
-sib4 re'2 do'4 do'2 |
-do'4 do'4 do'4 re'2 sol4 |
-si4 do'4 re'4 sol4 sol4. sol8 |
-sol4 do'2 do'4 do'2 |
-re'4 re'4 re'4 do'2 do'4 |
-fa4 la4 la4 sib4 sol4. fa8 |
-fa2. r2. |
-R1.*3 |
-r2. r2 do'4 |
-do'4 do'4 do'4 sib4 re'4 re'4 |
-do'4 do'2 do'4 do'2 |
-sib4 sib4 sib4 sib2 sib4 |
-sib4 sib4 do'4 fa4 fa4. fa8 |
-fa4 sib2 la4 r2 |
-r4 do'2 sib4 r2 |
-r4 re'2 re'4 re'2 |
-do'4 do'4 do'4 sib2 la4 |
-la4 la4 la4 sib4 sol4. fa8 |
-fa2. ~ fa2 
\ No newline at end of file
diff --git a/Lully/Opera/LWV71Armide/DDChaine/voix.ily b/Lully/Opera/LWV71Armide/DDChaine/voix.ily
new file mode 100644
index 00000000..2cc83c08
--- /dev/null
+++ b/Lully/Opera/LWV71Armide/DDChaine/voix.ily
@@ -0,0 +1,41 @@
+\clef "vtaille" r4 r8 do'8 do'2 |
+fa'4 la8 la8 sib2 |
+re'4. re'8 sol4 sol8 do'8 |
+fa4 fa4 fa8. sol16 la8 si8 |
+do'4 do'8 si8 do'4 do'4 |
+la8 la8 sib8 re'8 sol4 sol8 la8 |
+fad2 re'2 |
+mib'4 la8 do'8 fad8 re8 la4 |
+sib8 do'16 re'16 fad8. sol16 sol2 |
+do'2 fa'4 la8 do'8 |
+mi8 do8 sol4 la8 sib16 do'16 mi8.\tr fa16 |
+fa4. <>^\markup\italic tous la8 la2 |
+sib4 sib8 re'8 re'2 |
+re'4. do'8 sib4 sib8 do'8 |
+do'4 do'4 do'16 do'16 do'16 do'16 re'8 re'16 sol16 |
+sol4 sol4 si16 si16 si16 si16 la8 la16 sol16 |
+sol2^\viste sol4 r r do'4 |
+do'4 do'4 do'4 sib4 fa'4 mi'4 |
+dod'4 re'2 re'4 re'2 |
+re'4 re'4 re'4 sol2 la4 |
+fad4 re4 fad4 sol4 la4.\tr sib8 |
+sib4 re'2 do'4 do'2 |
+do'4 do'4 do'4 re'2 sol4 |
+si4 do'4 re'4 sol4 sol4. sol8 |
+sol4 do'2 do'4 do'2 |
+re'4 re'4 re'4 do'2 do'4 |
+fa4 la4 la4 sib4 sol4.\tr fa8 |
+fa2. r2*3/2 |
+R1.*3 |
+r2*3/2 r4 r do'4 |
+do'4 do'4 do'4 sib4 re'4 re'4 |
+do'4 do'2 do'4 do'2 |
+sib4 sib4 sib4 sib2 sib4 |
+sib4 sib4 do'4 fa4 fa4.\tr fa8 |
+fa4 sib2 la4 r r |
+r4 do'2 sib4 r r |
+r4 re'2 re'4 re'2 |
+do'4 do'4 do'4 sib2 la4 |
+la4 la4 la4 sib4 sol4.\tr fa8 |
+fa2.~ fa2
+
diff --git a/Lully/Opera/LWV71Armide/acte3.ily b/Lully/Opera/LWV71Armide/acte3.ily
index f0f32c7f..1674fb7d 100644
--- a/Lully/Opera/LWV71Armide/acte3.ily
+++ b/Lully/Opera/LWV71Armide/acte3.ily
@@ -42,10 +42,14 @@
 \pieceToc\markup [Entrée]
 \includeScore "DDBritournelle"
 %% 3-6
-\pieceToc \markup {
-  La Haine, chœur :
-  \italic { Amour, sors pour jamais d'un cœur qui te chasse. } }
+\newBookPart #'(full-rehearsal)
+\pieceToc\markup\wordwrap {
+  \smallCaps { La Haine, chœur : }
+  \italic { Amour, sors pour jamais, sors d'un cœur qui te chasse }
+}
 \includeScore "DDChaine"
+%% 3-7
+\newBookPart #'(full-rehearsal)
 \pieceTocTitle "Air"
 \includeScore "DDDair"
 \pieceToc \markup {
-- 
2.11.4.GIT