From 417823c424cd886e0b5835be072bcfe45dcebd2b Mon Sep 17 00:00:00 2001
From: Valentin <v.villenave@gmail.com>
Date: Tue, 30 Dec 2008 23:57:55 +0100
Subject: [PATCH] ActeDeuxSceneUn, COMPLETED

---
 definitions/settings.ly |  5 ++++-
 instruments/flute1.ly   |  4 ++--
 instruments/percu.ly    | 22 +++++++++++-----------
 master/master.ly        |  6 +++---
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/definitions/settings.ly b/definitions/settings.ly
index c51f2e8..52d3d98 100755
--- a/definitions/settings.ly
+++ b/definitions/settings.ly
@@ -151,7 +151,10 @@ includePartsLayout = \layout {
   }
   \context {
     \Staff
-    \remove Instrument_name_engraver
+    %%% It's silly to keep printing the instrument name in
+    %%% separate parts; however some instruments (clarinets, etc)
+    %%% may need it.
+    %\remove Instrument_name_engraver
   }
   \context {
     \Score
diff --git a/instruments/flute1.ly b/instruments/flute1.ly
index 08d1bd5..d6726d7 100755
--- a/instruments/flute1.ly
+++ b/instruments/flute1.ly
@@ -583,7 +583,7 @@ ActeDeuxSceneUnFluteUn = { \FluteUn
     R2.*4 R2 R2.*2 R2 | r2 \tt {si''16\p\<( red) re( fad) fa}|
     la4~--\mp( la8[ fa]~ fa8) r | r8. red16-. si4.--\> la'8~\pp | la2~ |
     la2.~ | la2~ | la4 r \t {r8 sol,,( mib'} | fad2.~) | fad4 r |
-    r \tt {sib16\p\<( mib) dod( fad) mi} la4~--\! | la4. sib,8\>( la'4~) |
+    r \tt {sib16\p\<( mib) dod( fad) mi} la4~--\! | la4. sib,8\>( la'4~)\! |
     la2.~| la4 r | R2. R2 | R2.*2 R2 |
     mi2.~\pp\<| mi2.~| mi2.~\mf\>| mi4\! r |
 
@@ -603,7 +603,7 @@ ActeDeuxSceneUnFluteUn = { \FluteUn
     sold,8\mp( la sold mi) re( mi) | sold( la sold mi) re( mi \ten sold4~) sold2.~ sold4 r r2 |
     R2. R1 R2. R1 r2 re4~--\p re re2-- r4 | r2 re4~-- |
     re2. r4 | r4 mi2~-- mi4 r mi-- r | r re2~-- re4 r r2 |
-    re''8-.\pleggiero r r2 | r r8 \st {re r8 r16 re, | re'8 r r2 | R1 r4 r8 re,} r4 |
+    re''8-.\ppleggiero r r2 | r r8 \st {re r8 r16 re, | re'8 r r2 | R1 r4 r8 re,} r4 |
     re,4--\p\< fa8( sib4) mib8~-- | mib2\! r4 |
     R2.*5 r4 re2~--\p re r4 | r mib8\mp( fa la2~) la4\! r2 |
     R1 lab,4\mp( solb fa mib fa8 mib fa solb lab4 | mib2.~) mib4 r r2 |
diff --git a/instruments/percu.ly b/instruments/percu.ly
index 315ac23..454ac94 100755
--- a/instruments/percu.ly
+++ b/instruments/percu.ly
@@ -1266,9 +1266,9 @@ EntractePercus = <<
 ActeDeuxSceneUnPercus = <<
   \new Staff \relative {\Vibraphone
     R2.*4 R2 R2.*2 R2
-    \st {mi,8\mp(\sustainOn do' sol' mib'\> lab si\!)}\laissezVibrer R2.*2
+    \st {mi,8\mp(\sustainOn do' sol' mib'\> lab si\laissezVibrer\!)} R2.*2
     \sustainOff R2 R2. R2 R2.*2 R2
-    \st {mi,,,8(\sustainOn si' do sol'\> lab mib'\!)}\laissezVibrer R2.*2
+    \st {mi,,,8(\sustainOn si' do sol'\> lab mib'\laissezVibrer\!)} R2.*2
     \sustainOff R2 R2. R2 R2.*2 R2
     <re la'>4--\p\sustainOn mi,-- <re la'>-- |
     \t {mi,8( <re' la'> mi)} \t {<re' la'>( mi, <re la'>)}
@@ -1327,11 +1327,11 @@ ActeDeuxSceneUnPercus = <<
       s4 <do re> r <do re> r <do re> |
       R1 s4 <do re> r |
       R1 R2. R1
-      r4 <mib solb> <mib solb> |
+      r4\mp <mib solb> <mib solb> |
       r <do fa> <do fa> r |
       r <mib solb> <mib solb> |
-      r <do fa> r <do fa> |
-      r <do fa> r | R1
+      r <do fa>\> r <do fa> |
+      r <do fa>\pp r | R1
       R2. R1 R2. R2 R1 R2. R1 R2. R1 R2. R1
     }
     \relative {
@@ -1347,11 +1347,11 @@ ActeDeuxSceneUnPercus = <<
       fad,\mp <la're> r | <la re> r <la re> r |
       <la re> r <la re> | r <la re> r <la re> |
       fad, <la're> r | <la re> r <la re> r |
-      sib,8 sib' fa fa, mi' do | sib2:32~\> sib4\! r |
-      fad2.:32~\p\> fad4\! r r2 | sib4 r2 |
-      fad2:32~ fad4 r | R2.
+      sib,8( sib') fa( fa,) mi'( do) | sib2:32--~\> sib4\! r |
+      fad2.:32--~\p\> fad4\! r r2 | sib4 r2 |
+      fad2:32--~ fad4 r | R2.
       R1 R2. R1 R2. R1 R2. R1
-      fad2.:32~\mp\> fad4\! r r2 |
+      fad2.:32--~\mp\> fad4\! r r2 |
       <sold'la>4-- r <sold la>-- |
       mi--\p <sold la> si,-- <sold'la> |
       fad,-- <sold'la> r |
@@ -1371,7 +1371,7 @@ ActeDeuxSceneUnPercus = <<
       dod,,( la' \droite <si'mi>) |
       fad\!( <la re>) \gauche dod,,( si' \droite <mi la>) \gauche
       dod,\>( si' \droite <mi la>) \gauche |
-      do,\! la' s4 r4 | la4 r la r |
+      do,(\! la') s4 r4 | la4 r la r |
       fad8--\mf( la \droite <do re> \gauche la \droite <do re> \gauche la) |
       fa--( lab \droite <do re> \gauche lab \droite <do re>4) \gauche r |
       fad,8--( la\droite <do re> \gauche la \droite <do re> \gauche la) |
@@ -1384,7 +1384,7 @@ ActeDeuxSceneUnPercus = <<
       sib,8( la' \droite <do fa> \gauche la \droite <do fa> \gauche la) |
       si,( lab' \droite <si mi> \gauche lab \droite <si mi>4) \gauche |
       R2.
-      mib,8\f la s4 r8 la s4 r8 mib s4 | r2 r4 <la si>\mf |
+      mib,8\f( la) s4 r8 la-. s4 r8 mib-. s4 | r2 r4 <la si>--\mf |
       mib-- s r |
       re--\p <si'dod> r <si dod> |
       re,-- <sib'do> r | R1
diff --git a/master/master.ly b/master/master.ly
index 9cf53ba..296b7fb 100644
--- a/master/master.ly
+++ b/master/master.ly
@@ -93,14 +93,14 @@
     piece = \EntracteTitre
   }
 } %
-%\pageBreak %
+%\pageBreak %}
 \score {
   \ActeDeuxSceneUn
   \header {
     acte = \ActeDeuxTitre
     piece = \SceneUnTitre
   }
-} %
+} %{
 \score {
   \ActeDeuxSceneUnBis
   \header {
@@ -112,7 +112,7 @@
   \header {
     piece = \SceneDeuxTitre
   }
-} %}
+} %
 \score {
   \ActeDeuxSceneTrois
   \header {
-- 
2.11.4.GIT