From dd2101447ba48b991902690e258cd1b1239bf15e Mon Sep 17 00:00:00 2001
From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sun, 25 Mar 2012 15:05:01 +0200
Subject: [PATCH] =?utf8?q?Atys=20:=20acte=205=20sc=C3=A8ne=207=20[4/7]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily | 27 ++++++++++++++++++---------
 Lully/Opera/LWV53Atys/FGDnymphes/dessus.ily   | 16 +++++++++++++---
 Lully/Opera/LWV53Atys/FGDnymphes/global.ily   | 17 ++++++++++++-----
 Lully/Opera/LWV53Atys/FGDnymphes/score.ily    | 22 ++++++++++++++--------
 Lully/Opera/LWV53Atys/FGDnymphes/silence.ily  |  2 +-
 5 files changed, 58 insertions(+), 26 deletions(-)
 rewrite Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily (100%)
 rewrite Lully/Opera/LWV53Atys/FGDnymphes/score.ily (79%)

diff --git a/Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily b/Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily
dissimilarity index 100%
index a65bd35d..4f7daa5b 100644
--- a/Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily
+++ b/Lully/Opera/LWV53Atys/FGDnymphes/chiffres.ily
@@ -1,9 +1,18 @@
-% 219
-<_>1. <2 4 6->2 <5/>1 <_> <6->2 <7-> <6>1 <7>2 <6>1 <_!>1.
-
-<_>2 <_!>2.\figExtOn <_!>4\bassFigureExtendersOff
-<6>1 <6!>2 <_-> <_!>1 <_> <6>2
-<_!>1\figExtOn <_!>4 <_!>\bassFigureExtendersOff
-<7>2 <5/ 6>1 <_>2 <5/ 7->1
-
-<_>2 <4> <_!>
\ No newline at end of file
+\simultaneous {
+  \ballardFigures {
+    % 142
+    s1. <6- 4 2>2 \naturalFig <6 5->1 s1. <6> <7> \naturalFig <_+> <_->2 \naturalFig <_+>1 <6> \naturalFig <6+>2
+    <_-> \naturalFig <_+>1 s <6>2 \naturalFig <_+>1. <7>2 <6>2. <5->4 s2 \naturalFig <6 5->1 s2 <7 _->2 <4>4 \naturalFig <_+>
+  }
+  \baussenFiguresAlt {
+    % 219
+    s1. <2 4 6->2 <5/>1 s <6->2 <7-> <6>1 <7>2 <6>1 <_!>1.
+    
+    s2 <_!>2.\figExtOn <_!>4\figExtOff
+    <6>1 <6!>2 <_-> <_!>1 s <6>2
+    <_!>1\figExtOn <_!>4 <_!>\figExtOff
+    <7>2 <5/ 6>1 s2 <5/ 7->1
+    
+    s2 <4> <_!>
+  }
+}
diff --git a/Lully/Opera/LWV53Atys/FGDnymphes/dessus.ily b/Lully/Opera/LWV53Atys/FGDnymphes/dessus.ily
index e8ad0692..516b6b89 100644
--- a/Lully/Opera/LWV53Atys/FGDnymphes/dessus.ily
+++ b/Lully/Opera/LWV53Atys/FGDnymphes/dessus.ily
@@ -10,6 +10,16 @@ lab''2 mi''2. fa''4 |
 fa''2 la'2. re''4 |
 si'2 sol''2. si'4 |
 do''2 do''( re''4) mib'' |
-re''2\trill fa''( mib''4)\trill re'' |
-mib''2 re''2.\trill do''4 |
-do''1. |
+re''2\trill fa''( mib''4)\tr re'' |
+\myfootnote #'NoteHead #'(0 . 2) \markup {
+  Manuscrit : \raise #3 \score {
+    { \tinyQuote \key sol \minor \clef "french" \time 3/2
+      mib''4. fa''8 re''2. r8 do'' | do''1.~ | do'' \bar "|."
+    }
+    \layout { \quoteLayout }
+  }
+} mib''2\trill re''2. do''4 |
+\myfootnote #'NoteHead #'(4 . 3) \markup {
+  Dans le matériel Philidor 1703, la deuxième partie
+  de l'air se joue deux fois.
+} do''1. |
diff --git a/Lully/Opera/LWV53Atys/FGDnymphes/global.ily b/Lully/Opera/LWV53Atys/FGDnymphes/global.ily
index 56021768..0249b3b8 100644
--- a/Lully/Opera/LWV53Atys/FGDnymphes/global.ily
+++ b/Lully/Opera/LWV53Atys/FGDnymphes/global.ily
@@ -1,5 +1,12 @@
-\oldKey sol \minor
-\newKey do \minor
-\time 3/2 \midiTempo #160
-s1.*6 \bar ":|"
-s1.*9 \bar "|."
\ No newline at end of file
+<<
+  { \oldKey sol \minor
+    \newKey do \minor
+    \time 3/2 \midiTempo #160
+    s1.*6 \origVersion\bar "|:|" \modVersion\bar ":|"
+    s1.*9 \bar "|."
+  }
+  \origLayout {
+    s1.*8\break
+    s1.*7\break
+  }
+>>
\ No newline at end of file
diff --git a/Lully/Opera/LWV53Atys/FGDnymphes/score.ily b/Lully/Opera/LWV53Atys/FGDnymphes/score.ily
dissimilarity index 79%
index 75f67779..6074088c 100644
--- a/Lully/Opera/LWV53Atys/FGDnymphes/score.ily
+++ b/Lully/Opera/LWV53Atys/FGDnymphes/score.ily
@@ -1,8 +1,14 @@
-\score {
-  \new StaffGroup <<
-    \new Staff << s4^"Flûtes" \global \includeNotes "dessus" >>
-    \new Staff << \global \includeNotes "basse" \includeFigures "chiffres" >>
-  >>
-  \layout { }
-  \midi { }
-}
+\score {
+  <<
+    \origVersion\new StaffGroupNoBar <<
+      \new Staff << \global \includeNotes "dessus" >>
+      \new Staff << \global \includeNotes "basse" \includeFigures "chiffres" >>
+    >>
+    \modVersion\new StaffGroup <<
+      \new Staff << s4^"[Flutes]" \global \includeNotes "dessus" >>
+      \new Staff << \global \includeNotes "basse" \includeFigures "chiffres" >>
+    >>
+  >>
+  \layout { }
+  \midi { }
+}
diff --git a/Lully/Opera/LWV53Atys/FGDnymphes/silence.ily b/Lully/Opera/LWV53Atys/FGDnymphes/silence.ily
index f3c452e8..2832175e 100644
--- a/Lully/Opera/LWV53Atys/FGDnymphes/silence.ily
+++ b/Lully/Opera/LWV53Atys/FGDnymphes/silence.ily
@@ -1 +1 @@
-R1.*6\noBreak R1.*9
\ No newline at end of file
+R1.*6 R1.*9
\ No newline at end of file
-- 
2.11.4.GIT