From 59522bd01ca2377092aeb0d707835ac02b1c8222 Mon Sep 17 00:00:00 2001
From: Valentin <v.villenave@gmail.com>
Date: Mon, 29 Dec 2008 16:06:50 +0100
Subject: [PATCH] Some kitsch ornaments in Entracte

---
 definitions/functions.ly | 12 +++---------
 instruments/flute1.ly    |  4 +++-
 instruments/flute2.ly    |  8 +++++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/definitions/functions.ly b/definitions/functions.ly
index 02ed635..964166c 100755
--- a/definitions/functions.ly
+++ b/definitions/functions.ly
@@ -38,19 +38,13 @@ plperc =
 #(define-music-function (parser location one two) (ly:music? ly:music?)
 #{ <<  { \stemDown $one \stemNeutral } \new DrumVoice { \stemUp $two } >> #})
 
-parallel=
-#(define-music-function (parser location droite gauche) (ly:music? ly:music?)
-#{ <<
-\context Staff = "md"   $droite
-\context Staff = "mg"   $gauche
->> #})
-
 %%% Piano stuff (Issue #442 workaround)
 
 #(define (remove music)
 "Sends the whole thing to Devnull whenever possible"
  (context-spec-music music 'Devnull))
 
+ %%FIXME: add arpeggios in the filter.
 #(define (event-filter event)
  (let ((n (ly:music-property event 'name)))
   (if (or
@@ -377,7 +371,7 @@ makePart =
                         (ly:music? ly:music?)
 #{\context Staff << $part \new GhostVoice $ref >> #})
 
-makeSection =
+makeSection = % two parts
 #(define-music-function (parser location part-one part-two ref)
                         (ly:music? ly:music? ly:music?)
 #{\new StaffGroup <<
@@ -385,7 +379,7 @@ makeSection =
     \new Staff $part-two
 >> #})
 
-makeExtraSection = % for violins
+makeExtraSection = % three parts, e.g. for violins
 #(define-music-function (parser location part-one part-two part-three ref)
                         (ly:music? ly:music? ly:music? ly:music?)
 #{\new StaffGroup <<
diff --git a/instruments/flute1.ly b/instruments/flute1.ly
index bc563bc..643d8a8 100755
--- a/instruments/flute1.ly
+++ b/instruments/flute1.ly
@@ -570,7 +570,9 @@ EntracteFluteUn = { \FluteUn
     la1.~ la1~ la4 r | la1 mi'2~ mi1~ mi4 r |
     la1.~ la2 sol fa~ fa mi2. r4 |
     la,4 sol fa mi fa8 mi fa sol |
-    la1~ la4 r | si1. si2 do2. r4 |
+    la1~ la4 r | si1. \grace do8 \afterGrace
+    si2\startTrillSpan { la16[ si]\stopTrillSpan }
+    do2. r4 |
     do2 si la~ la4 sol fa mi fa r |
     do1~ do4 r re2. r4 R1 R2. R2
   }
diff --git a/instruments/flute2.ly b/instruments/flute2.ly
index 871cb61..a78ddab 100755
--- a/instruments/flute2.ly
+++ b/instruments/flute2.ly
@@ -375,7 +375,7 @@ ActeUnSceneTroisBisFluteDeux = { \FluteDeux
     \tt {fa,16--( do mib fad la)} re8 r |
     \ten fad,1~\p fad2. r4 |
     \longHairpins {
-    r2 r4 dod\p( mi2\> dod\!) | 
+    r2 r4 dod\p( mi2\> dod\!) |
     r r4 do!\<( mib2\> do~\!) do2. r4 |
     R1*7
     fad2--\p r4 red\<( dod2\> red~\!) red4 } r r2 |
@@ -568,8 +568,10 @@ EntracteFluteDeux = { \FluteDeux
     la'1. mi1~ mi4 r mi1. re1 sold,4 r |
     do1. re1~ re4 r | mi1.~ mi2 la2. r4 |
     la4 sol8 r fa4 mi8 r mi'2 | fa mi re~ re do2. r4 |
-    dod,4 mi re2. dod4 dod1 re4 r |
-    la'4 sol fa mi fa2 | fa mi2. r4 |
+    dod,4 mi re2. dod4 |
+    \grace re8 \afterGrace dod1\startTrillSpan
+    {si16[ dod]\stopTrillSpan }re4 r |
+    la'4 sol fa mi fa2 fa mi2. r4 |
     la4 sol fa mi fa r do2 si la |
     la1~ la4 r si2. r4 | R1 R2. R2
   }
-- 
2.11.4.GIT