From 2b4b078201ad73597232d2c705bf777e125152cd Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Fri, 4 Jan 2019 00:20:01 +0100
Subject: [PATCH] Uncomment `\include tinwhistle-bagpipe-embellishments.ily` to
 show piping gracings

---
 6-8_marches/hills_of_glenorchy.ly             | 34 +++++++++--------
 6-8_marches/pibroch_o_donald_dubh.ly          |  6 ++-
 .../pipe_major_donald_maclean_of_lewis.ly     |  1 +
 hornpipes/the_jolly_beggarman.ly              | 37 ++++++++++++++-----
 4 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/6-8_marches/hills_of_glenorchy.ly b/6-8_marches/hills_of_glenorchy.ly
index 177cf70..27dc10e 100644
--- a/6-8_marches/hills_of_glenorchy.ly
+++ b/6-8_marches/hills_of_glenorchy.ly
@@ -13,22 +13,24 @@ global = {
 
 bpm = \tempo 4. = 90
 
-thrwd = {} %\grace { \fixed c'' { g,32 d cis } }
-grip  = {} %\grace { \fixed c'' { g,32 d g, } }
-hdbld = {} %\grace { \fixed c'' { d32 e } }
-hdble = {} %\grace { \fixed c'' { e32 fis } }
-hdblf = {} %\grace { \fixed c'' { fis32 g } }
-taor  = {} %\grace { \fixed c'' { g,32 d g, e } }
-dblg  = {} %\grace { \fixed c'' { g32 fis } }
-dblb  = {} %\grace { \fixed c'' { g32 b, d } }
-dbld  = {} %\grace { \fixed c'' { g32 d e } }
-dble  = {} %\grace { \fixed c'' { g32 e fis } }
-dblf  = {} %\grace { \fixed c'' { g32 fis g } }
-grA   = {} %\grace { \fixed c'' { a32 } }
-grg   = {} %\grace { \fixed c'' { g32 } }
-gre   = {} %\grace { \fixed c'' { e32 } }
-grd   = {} %\grace { \fixed c'' { d32 } }
-wbirl = {} %\grace { \fixed c'' { g,32 a, g, } }
+thrwd = {}
+grip  = {}
+hdbld = {}
+hdble = {}
+hdblf = {}
+taor  = {}
+dblg  = {}
+dblb  = {}
+dbld  = {}
+dble  = {}
+dblf  = {}
+grA   = {}
+grg   = {}
+gre   = {}
+grd   = {}
+wbirl = {}
+
+%\include "tinwhistle-bagpipe-embellishments.ily"
 
 
 fluteA = \fixed c'' {
diff --git a/6-8_marches/pibroch_o_donald_dubh.ly b/6-8_marches/pibroch_o_donald_dubh.ly
index 783a4e7..1c0a8ce 100644
--- a/6-8_marches/pibroch_o_donald_dubh.ly
+++ b/6-8_marches/pibroch_o_donald_dubh.ly
@@ -15,8 +15,10 @@ bpm = \tempo 4. = 90
 
 mbreak = {}
 
-thrwd = {} %\grace { \fixed c'' { g,32 d cis } }
-grip = {} %\grace { \fixed c'' { g,32 d g, } }
+thrwd = {}
+grip = {} 
+
+%\include "tinwhistle-bagpipe-embellishments.ily"
 
 fluteA = \fixed c'' {
 	\repeat unfold 2 {
diff --git a/6-8_marches/pipe_major_donald_maclean_of_lewis.ly b/6-8_marches/pipe_major_donald_maclean_of_lewis.ly
index d545fe8..408d5e7 100644
--- a/6-8_marches/pipe_major_donald_maclean_of_lewis.ly
+++ b/6-8_marches/pipe_major_donald_maclean_of_lewis.ly
@@ -29,6 +29,7 @@ thrwd = {}
 wbirl = {}
 gbirl = {}
 
+%\include "tinwhistle-bagpipe-embellishments.ily"
 
 
 fluteAA = \fixed c'' {
diff --git a/hornpipes/the_jolly_beggarman.ly b/hornpipes/the_jolly_beggarman.ly
index a7a3da5..ff9c4b8 100644
--- a/hornpipes/the_jolly_beggarman.ly
+++ b/hornpipes/the_jolly_beggarman.ly
@@ -5,9 +5,9 @@
 \header {
 	meter = "Hornpipe"
 	title = "The Jolly Beggarman"
-	composer = ""
 }
 
+
 global = {
 	\key d \major
 	\time 2/4
@@ -15,15 +15,35 @@ global = {
 
 bpm = \tempo 4. = 90
 
+grA = {} 
+grg = {} 
+gre = {} 
+grd = {} 
+
+thrwd = {} 
+
+dblb = {} 
+dblc = {} 
+dble = {} 
+dblg = {} 
+
+wbirl = {} 
+gbirl = {} 
+slurf = {} 
+
+
+%\include "tinwhistle-bagpipe.ily"
+
 fluteAA = \fixed c'' {
 	e8 |
 	\grg a,16. [ \grd a,32 \gre a,16. \grd b,32 ]		\grg a,16. [ b,32 \grg cis16. d32 ] |
 	\grg e16. [ fis32 \grg e16. cis32 ]				\thrwd d8 [ \grg cis16. d32 ] |
 	\grg e16. [ a,32 \gbirl a,8 ]					\grg a,16. [ b,32 \grg cis32 \grd a,16. ] |
-	\grg b,16. [ \grd g,32 \gre g,16. a,32 ]			\dblb b,8 [ e8 ] |
+	\grg b,16. [ \grd g,32 \gre g,16. a,32 ]			\dblb b,8
 
 }
 fluteAB = \fixed c'' {
+	e8 |
 	\grg a,16. [ \grd a,32 \gre a,16. \grd b,32 ]		\grg a,16. [ b,32 \grg cis16. d32 ] |
 	\grg e16. [ fis32 \grg e16. cis32 ]				\thrwd d8 [ \grg cis16. d32 ] |
 	\grg e16. [ a32 \grg a16. g32 ]					a16. [ fis32 \dble e16. d32 ] |
@@ -44,22 +64,19 @@ fluteBBA = \fixed c'' {
 	\grg e16. [ a32 \grg a16. g32 ] a16. [ fis32 \dble e16. d32 ] |
 	\dblc cis8 [ \gre a,8 ] \wbirl a,8
 }
-fluteBBB = \fixed c'' {
-	e8 |
-	\fluteAB
-}
+fluteBBB = \fluteAB
 
 flutePart = \new Staff \with {
   instrumentName = "Fl."
   midiInstrument = "flute"
 } {
 	\global
-	\repeat volta 2 { \partial 8 \fluteAA \fluteAB \tag #'midiRemove { s8 |}  }
+	\repeat volta 2 { \partial 8 \fluteAA \portraitbreak \fluteAB \tag #'midiRemove { s8 |}  }
 	\break
 	\repeat volta 2 { \partial 8 \fluteBA }
 		\alternative {
-			{ \break \fluteBBA \tag #'midiRemove { s8 |} }
-			{ \break \fluteBBB \tag #'midiRemove { s8 |} }
+			{ \portraitbreak \fluteBBA \tag #'midiRemove { s8 |} }
+			{ \portraitbreak \fluteBBB \tag #'midiRemove { s8 |} }
 		}
 	\bar "|."
 }
@@ -78,4 +95,4 @@ flutePart = \new Staff \with {
 	\midi {
 		\bpm
 	}
-}
\ No newline at end of file
+}