From cecee9bdb5b18ba2fc927d454de68d6a8b7e0d3a Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@localhost.localdomain>
Date: Sun, 14 Dec 2008 22:18:14 +0100
Subject: [PATCH] Entracte, take 9

Strings. Nothing else.
---
 definitions/functions.ly    | 179 ++++++++++++++++++++++----------------------
 instruments/alto1.ly        |  72 ++++++++++++++++++
 instruments/alto2.ly        |  74 ++++++++++++++++++
 instruments/contrebasse.ly  |  48 ++++++++++++
 instruments/violon1.ly      |   4 +-
 instruments/violon2.ly      |   2 +-
 instruments/violon3.ly      |   2 +-
 instruments/violoncelle1.ly |  66 ++++++++++++++++
 instruments/violoncelle2.ly |  63 ++++++++++++++++
 master/master.ly            |   6 +-
 10 files changed, 421 insertions(+), 95 deletions(-)

diff --git a/definitions/functions.ly b/definitions/functions.ly
index 73d27d3..20bddea 100755
--- a/definitions/functions.ly
+++ b/definitions/functions.ly
@@ -81,7 +81,95 @@ showAnyway =
   percent-repeat-interface stanza-number-interface)
 #})
 
-%% Articulation shortcuts -----------------------------------------%
+%% Music formatting -----------------------------------------------%
+
+graceNotes =
+#(define-music-function (parser location notes) (ly:music?)
+#{ \tiny $notes \normalsize #})
+
+parlato =
+#(define-music-function (parser location notes) (ly:music?)
+#{ \override NoteHead #'style = #'cross
+  $notes
+\revert NoteHead #'style #})
+
+slap =
+#(define-music-function (parser location music) (ly:music?)
+#{\override NoteHead #'stencil = #ly:text-interface::print
+  \override NoteHead #'text = \markup \musicglyph #"scripts.sforzato"
+  \override NoteHead #'extra-offset = #'(0.1 . 0.0 )
+  $music
+  \revert NoteHead #'stencil
+  \revert NoteHead #'text
+  \revert NoteHead #'extra-offset #})
+
+hideNote = {
+\once \override NoteHead  #'transparent = ##t
+\once \override NoteHead  #'no-ledgers = ##t
+\once \override Stem  #'transparent = ##t
+\once \override Beam  #'transparent = ##t
+\once \override Accidental  #'transparent = ##t
+}
+
+noTuplet = {
+\once \override TupletBracket #'transparent = ##t
+\once \override TupletNumber #'transparent = ##t
+}
+
+oneStemDown = {
+\once \override Stem #'direction = #DOWN
+}
+
+oneStemUp = {
+\once \override Stem #'direction = #UP
+}
+
+%% Music shortcuts ------------------------------------------------%
+
+sk = \set Score.skipTypesetting = ##t
+
+unsk = \set Score.skipTypesetting = ##f
+
+% This might not be needed
+#(define (octave-up noteevent)
+ (let* ((pitch (ly:music-property noteevent 'pitch))
+        (octave (ly:pitch-octave pitch))
+        (note (ly:pitch-notename pitch))
+        (alteration (ly:pitch-alteration pitch))
+        (duration (ly:music-property noteevent 'duration))
+        (newnoteevent
+          (make-music 'NoteEvent
+            'duration duration
+            'pitch (ly:make-pitch (1- octave) note alteration))))
+   newnoteevent))
+
+#(define (octavize-chord elements)
+ (cond ((null? elements) elements)
+       ((eq? (ly:music-property (car elements) 'name) 'NoteEvent)
+         (cons (car elements)
+               (cons (octave-up (car elements))
+                     (octavize-chord (cdr elements)))))
+       (else (cons (car elements) (octavize-chord (cdr elements))))))
+
+#(define (octavize music)
+ (let* ((es (ly:music-property music 'elements))
+        (e (ly:music-property music 'element))
+        (name (ly:music-property music 'name)))
+   (cond ((eq? name 'EventChord)
+          (ly:music-set-property! music 'elements (octavize-chord es)))
+         ((pair? es)
+          (for-each (lambda(x) (octavize x)) es))
+         ((ly:music? e)
+          (octavize e))))
+ music)
+
+oct = #(define-music-function (parser location mus) (ly:music?)
+ (octavize mus))
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%% Music Decoration %%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Articulation marks ---------------------------------------------%
 
 #(define (make-script x)
    (make-music 'ArticulationEvent
@@ -174,13 +262,13 @@ CaV=
                                        m)
 harmo =
 #(define-music-function (parser location chord result) (ly:music? ly:music?)
- #{ << \oneVoice $chord \\ { \voiceTwo %FIXME: ties could look better.
+ #{ << \oneStemDown $chord \\ { \stemUp %FIXME: ties could look better.
    \override NoteHead #'stencil = #ly:text-interface::print
    \override NoteHead #'text = \markup { \null \musicglyph #"noteheads.s2"}
    \once \override NoteHead #'text = \markup {\null \override #'(direction . 1)
       \dir-column {\musicglyph #"noteheads.s2" \teeny \musicglyph #"eight"}}
     \override Stem #'stencil = ##f $result
-    \revert Stem #'stencil \revert NoteHead #'stencil } >> #})
+    \revert Stem #'stencil \revert NoteHead #'stencil \stemNeutral } >> #})
 
 thumbpizz =
 #(make-music 'TextScriptEvent
@@ -212,49 +300,6 @@ plak =
      (ly:music-property m 'tweaks)))
    m)
 
-%% Music shortcuts ------------------------------------------------%
-
-sk = \set Score.skipTypesetting = ##t
-
-unsk = \set Score.skipTypesetting = ##f
-
-% This might not be needed
-#(define (octave-up noteevent)
- (let* ((pitch (ly:music-property noteevent 'pitch))
-        (octave (ly:pitch-octave pitch))
-        (note (ly:pitch-notename pitch))
-        (alteration (ly:pitch-alteration pitch))
-        (duration (ly:music-property noteevent 'duration))
-        (newnoteevent
-          (make-music 'NoteEvent
-            'duration duration
-            'pitch (ly:make-pitch (1- octave) note alteration))))
-   newnoteevent))
-
-#(define (octavize-chord elements)
- (cond ((null? elements) elements)
-       ((eq? (ly:music-property (car elements) 'name) 'NoteEvent)
-         (cons (car elements)
-               (cons (octave-up (car elements))
-                     (octavize-chord (cdr elements)))))
-       (else (cons (car elements) (octavize-chord (cdr elements))))))
-
-#(define (octavize music)
- (let* ((es (ly:music-property music 'elements))
-        (e (ly:music-property music 'element))
-        (name (ly:music-property music 'name)))
-   (cond ((eq? name 'EventChord)
-          (ly:music-set-property! music 'elements (octavize-chord es)))
-         ((pair? es)
-          (for-each (lambda(x) (octavize x)) es))
-         ((ly:music? e)
-          (octavize e))))
- music)
-
-oct = #(define-music-function (parser location mus) (ly:music?)
- (octavize mus))
-
-
 %%%%%%%%%%%%%%%%%%%%%%%% Layout Functions %%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Music layout ---------------------------------------------------%
@@ -283,48 +328,6 @@ oct = #(define-music-function (parser location mus) (ly:music?)
      `(Staff ,(make-accidental-rule 'same-octave 1)
              ,(make-accidental-rule 'any-octave 1)))
 
-%% Music formatting -----------------------------------------------%
-
-graceNotes =
-#(define-music-function (parser location notes) (ly:music?)
-#{ \tiny $notes \normalsize #})
-
-parlato =
-#(define-music-function (parser location notes) (ly:music?)
-#{ \override NoteHead #'style = #'cross
-  $notes
-\revert NoteHead #'style #})
-
-slap =
-#(define-music-function (parser location music) (ly:music?)
-#{\override NoteHead #'stencil = #ly:text-interface::print
-  \override NoteHead #'text = \markup \musicglyph #"scripts.sforzato"
-  \override NoteHead #'extra-offset = #'(0.1 . 0.0 )
-  $music
-  \revert NoteHead #'stencil
-  \revert NoteHead #'text
-  \revert NoteHead #'extra-offset #})
-
-hideNote = {
-\once \override NoteHead  #'transparent = ##t
-\once \override NoteHead  #'no-ledgers = ##t
-\once \override Stem  #'transparent = ##t
-\once \override Beam  #'transparent = ##t
-\once \override Accidental  #'transparent = ##t
-}
-
-noTuplet = {
-\once \override TupletBracket #'transparent = ##t
-\once \override TupletNumber #'transparent = ##t
-}
-
-oneStemDown = {
-\once \override Stem #'direction = #DOWN
-}
-
-oneStemUp = {
-\once \override Stem #'direction = #UP
-}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%% Editorial %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Individual parts -----------------------------------------------%
diff --git a/instruments/alto1.ly b/instruments/alto1.ly
index 415af5e..18a9119 100755
--- a/instruments/alto1.ly
+++ b/instruments/alto1.ly
@@ -706,6 +706,78 @@ ActeUnSceneQuatreAltoUn = { \AltoUn
 EntracteAltoUn = { \AltoUn
   \relative {
     R2*9
+    <re, re'>4 r r2 R1*6 re16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r2 |
+    re16 re re re mib mib mib mib fa fa fa fa sib sib sib sib |
+    re4:16 re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re'2:16 re,2:16 re': re: |
+    re4 r r2 | R1*2
+    re,1~ re2. r4 | R1*2
+    re1~ re2. r4 | do'4 reb re mib |
+    mi r r <mib, la> | r <re dod'> r <re do'> |
+    re'4:16 re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re'4 re, re re re re re |
+    re2:8 re: |
+
+    %%% Fugato %%%
+    red1~ red~ red2.~ red~ red2~ |
+    red1~ red2 r4 | sol2.\glissando fad'1~
+    fad~ fad2.\glissando re!2.~ re1~ re~ re2.~ re~
+    re1~ re~ <sol, re'>2.~ <sol re'>~ <sol re'>2 <re' la'>~ |
+    <re la'>8 <sol, re'>4. <re' la'> <sol, re'>8~ |
+    <sol re' la'>4 <do, sol' re'> <sol' re' la'> |
+    <do, sol' re'> <sol' re' la'> <do, sol' re'> |
+    <re' la'>4:8 <sol, re'>: <re' la'>: <sol, re'>: |
+
+    %%% Stretto %%%
+    re'2:16 re: | re: re: |
+    re4 <dod re>2 r4 \clef treble |
+    r8 \pizz si'' re,4 sold, r \clef alto |
+    sol mi r sol |
+    \arco sold2:8 sold8 lad lad4:8 |
+    sold: sold8 lad lad2:8 |
+    sol!2:8 sol: | dod,: dod: |
+    <sib re>4 r r2 | r4 \pizz re, r re r re r2 | R1
+
+    %%% Noir %%%
+    R2.-\fermataMarkup red'4 r2 | R2. red4 r2 R2. R2 |
+    red4 r2 r4 red r2 | r4 red, r | R2 sol4 r r2 |
+    R1*4 R1.*4 R1 R2.-\fermataMarkup
+
+    R2. r4 \arco la2~ la2.~ la~ la~ la~ la~ la2 r4 | R2.-\fermataMarkup
+
+    %%% Poco più %%%
+    la2.~ la~ la~ la2 r4 | R2.-\fermataMarkup |
+
+    %%% Andantino %%%
+    R1 R2 R1 R2 R1 R2 R1 R2. \clef treble
+
+    %%% Largo non troppo %%%
+    la''4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    <la, la'>1.~ <la la'> <sol mi'>
+    \pl fa1. {mi'2 re1} | <la la'>1.
+    \pl {la4 sol fa mi} {si'2 do} <fa, re'> |
+    <sol do>1 <sol do>2 \clef alto |
+    <la, la'>2 dod, <sol' mi'> |
+    <fa re'> re <la' fa'> | <si fa'> sol <si sol'> |
+    <do sol'> <do, sol'> do' |
+    <re, re'> <re re'> <re re'> |
+    <red red'> <red red'> <red red'> |
+    <mi mi'> r1 | <mi mi'>2 r | R1 R2. R2
   }
 }
 
diff --git a/instruments/alto2.ly b/instruments/alto2.ly
index 3528f41..1b1001d 100644
--- a/instruments/alto2.ly
+++ b/instruments/alto2.ly
@@ -702,6 +702,80 @@ ActeUnSceneQuatreAltoDeux = { \AltoDeux
 EntracteAltoDeux = { \AltoDeux
   \relative {
     R2*9
+    <re, re'>4 r r2 R1*6
+    re16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r2 |
+    re16 re re re re re re re re re lab' lab re, re si'? si |
+    re,4:16 re': re,: re': |
+    re,: re': re, re': |
+    re,: re': re, re': |
+    re,: re': re, re': |
+    re,: re': re, re': |
+    re,: re': re, re': |
+    re,2:16 re'2:16 re,: re: |
+    re4 r r2 | R1*2
+    re1~ re2. r4 | R1*2
+    re1~ re2. r4 | sol lab la sib si r r <re, sol> r <re sold> r mib |
+    re4:16 re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,4 re re re re re re |
+    re2:8 re: |
+
+    %%% Fugato %%%
+    red1~ red~ red2.~ red~ red2~ |
+    red1~ red2.~ red~ <red sol>1~ <red sol>~ <red sol>2.~ red~
+    red1~ red~ red2.~ red~ red1~ red2. r4 |
+    do2:8 do4: do2: do4: <do sol'>2:8 <do sol'>: <do sol'>: <do sol'>:
+    <do sol' re'>4 <sol' re' la'> <do, sol' re'> <sol' re' la'>
+    <do, sol' re'> <sol' re' la'> |
+    <sol re'>4:8 <re' la'>: <sol, re'>: <re' la'>: |
+
+    %%% Stretto %%%
+    re2:16 re: | re: re: |
+    re4 <dod re>2 r4 \clef treble |
+    r4 r8 \pizz fad' sold,4 r \clef alto |
+    mi sol r mi |
+    \arco mi2:8 mi8 fad fad4:8 |
+    mi: mi8 fad fad2:8 |
+    si,2:8 si: | lad: lad: |
+    <sib re>4 r r2 | R1*3
+
+    %%% Noir %%%
+    R2.-\fermataMarkup \pizz red4 r2 | R2. red4 r2 R2. R2 |
+    red4 r2 r4 red, r2 | r4 red r | R2 mi4 r r2 |
+    R1*4 R1.*4 R1 R2.-\fermataMarkup
+
+    R2. r4 \arco la2~ la2.~ la~ la~ la~ la~ la2 r4 | R2.-\fermataMarkup
+
+    %%% Poco più %%%
+    la2.~ la~ la~ la2 r4 | R2.-\fermataMarkup |
+
+    %%% Andantino %%%
+    R1 R2 R1 R2 R1 R2 R1 R2. \clef treble
+
+    %%% Largo non troppo %%%
+    la'4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi r2 |
+    la'4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi r2 \clef alto |
+    <la,, la'>1. <sol re' re'>1 <sol re'>2 |
+    <sol sol' do>1 <do, sol' sol'>2 |
+    <dod sol' mi'> <la' mi'> dod, |
+    <re la' fa'> re' re, |
+    <re sol re'> <si' fa'> <re, sol> |
+    <do sol' mi'> do' do, |
+    <re re'> <re re'> <re re'> |
+    <red red'> <red red'> <red red'> |
+    <mi mi'> r1 | <mi mi'>2 r | R1 R2. R2
   }
 }
 
diff --git a/instruments/contrebasse.ly b/instruments/contrebasse.ly
index c015183..d86d2b7 100644
--- a/instruments/contrebasse.ly
+++ b/instruments/contrebasse.ly
@@ -508,6 +508,54 @@ EntracteContrebasse = { \Contrebasse
   \relative {
     sold,,2~ sold sold~ sold |
     sold~ sold sold sold sold4 r8 \t {sold16 dod si} |
+    re4 r r2 | R1*22
+    re'2:16\CaV re:\CaV re:\CaV re:\CaV re:\CaV re:\CaV re:\CaV re:\CaV
+    re:\CaV re:\CaV re:\CaV re:\CaV re:\CaV re16 dod si sib lab sol fa mib |
+    re4 r r2 \pizz re4 r si fa' dod red sold,8 sold' r4 |
+    fad,4 sib mib reb fa si, do mi sib fad sol la8 sol |
+    la4 sol'8 la mi4 do | re2:8 re: re: re4: re2: re: |
+
+    %%% Fugato %%%
+    <mi, mi'>1~ <mi mi'>~ <mi mi'>2.~ <mi mi'>~ <mi mi'>4 r |
+    mi'1~ mi2.~ mi~ mi1~ mi~ mi2.~ mi4 r2 |
+    mi,1~ mi~ mi2.~ mi fa2 mi fa1~ fa2.~ fa2. |
+    r4 fad2. sol2 fad sol2. r4 sol2 |
+    sold2. \t {sold8 si dod} |
+
+    %%% Stretto %%%
+    re2:8 re: re: re:
+    re8 re'\CaV re4:8\CaV re2:8\CaV
+    <re, do'\harmonic>2:8
+    <re do'\harmonic>:
+    <re do'\harmonic>:
+    <re do'\harmonic>:
+    <re si'\harmonic>:
+    <re si'\harmonic>:
+    <re si'\harmonic>:
+    <re si'\harmonic>:
+    <re sol\harmonic>:
+    <re sol\harmonic>:
+    \ordin mi: mi: re4 r r2 R1*3
+
+    %%% Noir %%%
+    R2.-\fermataMarkup R2.*4 R2 R2. R1
+    R2. R2 R1*5 R1.*4 R1 R2.-\fermataMarkup
+    R2.*8 R2.-\fermataMarkup
+
+    %%% Poco più %%%
+    la2. sib do dod2 r4 R2.-\fermataMarkup
+
+    %%% Andantino %%%
+    R1 R2 R1 R2 R1 R2 R1 R2.
+
+    %%% Largo non troppo %%%
+    la2 la la si si si do do do re re re |
+    la la la si si si do do do re re re |
+    <la la'> <la la'> <la la'> <si sol'> <si sol'> <si sol'> |
+    <do sol'> <do sol'> <do sol'> dod dod dod |
+    <re re'> <re re'> <re re'> sol, <sol' sol> sol, |
+    do do do re re re red red red |
+    <mi, mi'> r1 <mi mi'>2 r R1 R2. R2
   }
 }
 
diff --git a/instruments/violon1.ly b/instruments/violon1.ly
index ba811a5..6ea7da6 100644
--- a/instruments/violon1.ly
+++ b/instruments/violon1.ly
@@ -694,7 +694,7 @@ EntracteViolonUn = { \ViolonUn
       <si mi\harmonic>2.~ <si mi\harmonic>~
       <si mi\harmonic>1~ <si mi\harmonic>~
       <si mi\harmonic>2.~ <si mi\harmonic>~
-    <si mi\harmonic>} si'4 r | %%FIXME: compilation warning.
+    <si mi\harmonic>} si'4 r |
     r sol2.\glissando fad'2.~ fad ~ |
     fad2~ fad8 r <mib, mib'> <mib mib'> |
 
@@ -704,7 +704,7 @@ EntracteViolonUn = { \ViolonUn
     re16 re re re <dod re>2.~ <dod re> r4 |
     r8 \pizz fa'' sol,4 re r |
     sold, r r8 lad r4 sold r8 lad r2 |
-    \arco si8 si si si si si si si dod dod dod dod dod dod dod dod |
+    \arco si2:8 si: dod2:8 dod: |
     <re, re'>4 r r2 | r4 \pizz re r re r re r2 | re4 r re r |
 
     %%% Noir %%%
diff --git a/instruments/violon2.ly b/instruments/violon2.ly
index 291ecd3..1c81714 100755
--- a/instruments/violon2.ly
+++ b/instruments/violon2.ly
@@ -689,7 +689,7 @@ EntracteViolonDeux = { \ViolonDeux
     re16 re re re <dod re>2.~ <dod re> r4 |
     r4 r8 \pizz si'' re,4 r |
     sold, r r8 lad r4 sold r8 lad r2 |
-    \arco si8 si si si si si si si dod dod dod dod dod dod dod dod |
+    \arco si2:8 si: dod2:8 dod: |
     <re, re'>4 r r2 | R1*3
 
     %%% Noir %%%
diff --git a/instruments/violon3.ly b/instruments/violon3.ly
index 6f90809..f97318d 100755
--- a/instruments/violon3.ly
+++ b/instruments/violon3.ly
@@ -674,7 +674,7 @@ EntracteViolonTrois = { \ViolonTrois
     re16 re re re <dod re>2.~ <dod re> r4 |
     r4 \pizz sol'' re r |
     mi, r r8 fad r4 mi r8 fad r2 |
-    \arco sol8 sol sol sol sol sol sol sol lad lad lad lad lad lad lad lad |
+    \arco sol2:8 sol: lad: lad: |
     <re, sib'>4 r r2 | R1*3
 
     %%% Noir %%%
diff --git a/instruments/violoncelle1.ly b/instruments/violoncelle1.ly
index 9d05ed1..45534a4 100644
--- a/instruments/violoncelle1.ly
+++ b/instruments/violoncelle1.ly
@@ -641,6 +641,72 @@ EntracteVioloncelleUn = { \VioloncelleUn
   \relative {
     sold,2~sold~sold sold~sold sold sold~sold4 sold~|
     sold4 sold8 \t {sold16 fa sol} |
+    re4 re''4:16 re2:16 |
+    re: re: re: re: re: re: re: re: re: re: |
+    re: re: re: re: re: re: re: re: re4 r r2 | R1*10
+    re,16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r re16 re re re | re4 r r2 |
+    \pizz mib,8 solb mi4 si'8 re, do4 | fad r r2 |
+    r4 sol8 sib lab reb r4 | R1
+    \arco re16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r2 |
+    re4:8 re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re': re,: re': re,: |
+    re'4 re re re re re re |
+    re re re re |
+
+    %%% Fugato %%%
+    mi,2:8 mi: mi:mi: mi: mi4: mi2: mi4: mi2: |
+    mi: mi: mi: mi4: mi2: mi4: mi2: mi: mi: mi: mi2: mi4: mi2: mi4: |
+    mi2: mi: mi: mi: mi: mi4: mi2: mi4: mi2: mi: mi: mi: |
+    <mi do'>2.~ <mi do'>~ <fad re'>1~ <fad re'>2. r4 |
+    <re' la'>4:8 <sol, re'>: <re' la'>: <sol, re'>: <re' la'>: <sol, re'>: |
+    sib2:8 sib:
+
+    %%% Stretto %%%
+    re2:16 re: re: re: re4 r \harmo {<red sold\harmonic >2~ <red sold\harmonic >2.} red'2
+    r4 \pizz sol, mi r sol |
+    \arco mi mi re re mi mi re re |
+    <fa, re'> <fa re'> <fa re'> <fa re'> |
+    <mi si'> <mi si'> <mi si'> <mi si'> |
+    <sib'' re> r r2 \clef treble |
+    r4 \pizz re'\CaV r re\CaV r re\CaV r2 | R1
+
+    %%% Noir %%%
+    R2.-\fermataMarkup R2.*4 R2 R2. R1 R2. R2
+    R1*5 R1.*4 R1 R2.-\fermataMarkup
+
+    r2 \arco la4~\CaV la2.~\CaV la~\CaV la~\CaV la~\CaV
+    la~\CaV la~\CaV la2\CaV r4 | R2.-\fermataMarkup \clef bass
+
+    %%% Poco più %%%
+    R2.*4 R2.-\fermataMarkup
+
+    %%% Andantino %%%
+    R1 R2 R1 R2 R1 R2 R1 R2.
+
+    %%% Largo non troppo %%%
+    la,2 la la la la la la la la la r \clef treble mi'4 sol |
+    la sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi8 r fa' mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la la, sol sol' fa fa, mi mi' fa mi fa sol |
+    la la, sol sol' fa fa, mi mi' fa mi fa sol |
+    la la, sol sol' fa fa, mi mi' fa mi fa sol |
+    la la, sol sol' fa fa, mi mi' fa mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 mi r1 \clef bass |
+    <mi,,, si' re la'>4 mi' r2 R1 R2. R2
   }
 }
 
diff --git a/instruments/violoncelle2.ly b/instruments/violoncelle2.ly
index ac373b9..d5a766c 100644
--- a/instruments/violoncelle2.ly
+++ b/instruments/violoncelle2.ly
@@ -635,6 +635,69 @@ EntracteVioloncelleDeux = { \VioloncelleDeux
   \relative {
     sold,2~sold~sold sold~sold sold sold~sold4 sold~|
     sold4 sold8 \t {sold16 fa sol} |
+    re4 re''4:16 re2:16 |
+    re: re: re: re: re: re: re: re: re: re: |
+    re: re: re: re: re: re: re: re: re4 r r2 | R1*10
+    re,16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r re,16 re re re | re4 r r2 |
+    \pizz mib4 mi8 la si4 do,8 fa fad4 r r2 |
+    r4 sol8 sib lab reb r4 | R1
+    \arco re16 re re re re4 r8 re16 re re re re8 |
+    re16 re re re re4 r2 |
+    re,4:8 re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,: re': re,: re': |
+    re,4 re re re re re re |
+    re re re re |
+
+    %%% Fugato %%%
+    mi2:8 mi: mi:mi: mi: mi4: mi2: mi4: mi2: |
+    mi: mi: mi: mi4: mi2: mi4: mi2: mi: mi: mi: mi2: mi4: mi2: mi4: |
+    mi2: mi: mi: mi: mi: mi4: mi2: mi4: mi2: mi: mi: mi: |
+    mi: mi4: mi2: mi4: fa?2: fa: fad: fad:
+    <sol re'>4:8 <re' la'>: <sol, re'>: <re' la'>: <sol, re'>: <re' la'> |
+    mib,2:8 mib:
+
+    %%% Stretto %%%
+    re'2:16 re: re: re: re4 r \harmo {<sol, mi'\harmonic >2~ <sol mi'\harmonic >2.} si'2
+    r4 \pizz mi, sol r mi |
+    \arco sold, sold sol sol sold sold sol sol
+    <fa re'> <fa re'> <fa re'> <fa re'> |
+    <mi si'> <mi si'> <mi si'> <mi si'> |
+    <re sib'> r r2 R1*3 |
+
+    %%% Noir %%%
+    R2.-\fermataMarkup R2.*4 R2 R2. R1 R2. R2
+    R1*5 R1.*4 R1 R2.-\fermataMarkup \clef treble
+
+    r2 \arco la'''4~\CaV la2.~\CaV la~\CaV la~\CaV la~\CaV
+    la~\CaV la~\CaV la2\CaV r4 | R2.-\fermataMarkup \clef bass
+
+    %%% Poco più %%%
+    R2.*4 R2.-\fermataMarkup
+
+    %%% Andantino %%%
+    R1 R2 R1 R2 R1 R2 R1 R2.
+
+    %%% Largo non troppo %%%
+    la,,2 la la si si si do do do re re re |
+    la <la la' la> la si <si la' la> si |
+    do <do sol' la> do re <re re la'> r \clef treble |
+    la''4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la la' sol sol, fa fa' mi mi, fa mi fa sol |
+    la la' sol sol, fa fa' mi mi, fa mi fa sol |
+    la la' sol sol, fa fa' mi mi, fa mi fa sol |
+    la la' sol4 fa,8 fa' mi4 fa8 mi fa sol |
+    la4 sol fa mi fa8 mi fa sol |
+    la4 mi r1 \clef bass |
+    <mi,,, si' re la'>4 mi' r2 R1 R2. R2
   }
 }
 
diff --git a/master/master.ly b/master/master.ly
index 78c3e3a..e4b539c 100644
--- a/master/master.ly
+++ b/master/master.ly
@@ -42,7 +42,7 @@
     piece = \InterludeTitre
     dessin = \Arrosoir
   }
-} %}
+} %
 \score {
   \ActeUnSceneDeux
   \header {
@@ -86,13 +86,13 @@
   \header {
     piece = \FinaleTitre
   }
-} %
+} %}
 \score {
   \Entracte
   \header {
     piece = \EntracteTitre
   } %\midi {}
-} %
+} %{
 %\pageBreak
 \score {
   \ActeDeuxSceneUn
-- 
2.11.4.GIT