From 7276b674ccfebdf63143613698e63baad1d35715 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Wed, 10 Oct 2018 13:57:33 +0200
Subject: [PATCH] Added Heights of Cassino

---
 .../pipe_major_donald_maclean_of_lewis.ly     |  2 +-
 6-8_marches/the_heights_of_cassino.ly         | 78 +++++++++++++++++++
 book/book.lytex                               |  8 ++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 6-8_marches/the_heights_of_cassino.ly

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 244a624..7d92a8c 100644
--- a/6-8_marches/pipe_major_donald_maclean_of_lewis.ly
+++ b/6-8_marches/pipe_major_donald_maclean_of_lewis.ly
@@ -76,7 +76,7 @@ fluteCB = \fixed c'' {
 
 fluteDA = \fixed c'' {
 	e8 |
-	\gbirl a,4 a,8 \grg a,8. g16 a,8 |
+	\gbirl a,4 a8 \grg a8. g16 a8 |
 	g8. e16 \gra e8 \dble e8. d16 b,8 |
 	\grg a,8. \grd b,16 \gre a,8 \grg g,4 \grd b,8 |
 	\thrwd d4 e8 \dble e8. d16 b,8 |
diff --git a/6-8_marches/the_heights_of_cassino.ly b/6-8_marches/the_heights_of_cassino.ly
new file mode 100644
index 0000000..75ad0c2
--- /dev/null
+++ b/6-8_marches/the_heights_of_cassino.ly
@@ -0,0 +1,78 @@
+\version "2.16.0"
+
+\include "tinwhistle.ily"
+
+\header {
+	meter = "March"
+	title = "The Heights of Cassino"
+	composer = "Dan MacRae"
+}
+
+global = {
+	\key d \major
+	\time 6/8
+}
+
+bpm = \tempo 4. = 90
+
+fluteMid = \fixed c'' {
+	e8. fis16 e8	e4 d8 |
+	e16 fis8. e8	d8. b,16 g,8 |
+}
+fluteEnd = \fixed c'' {
+	fis8. a,16 a,8	e16 fis8. e8 |
+	d4. d4
+}
+fluteApart = \fixed c'' {
+	\tag #'upbeat { fis8 | }
+	a,8. a,16 a,8	b,16 d8. e8 |
+	fis4 a8	fis8. e16 d8 |
+}
+fluteBpart = \fixed c'' {
+	\tag #'upbeat { fis16. g32 | }
+	a8. fis16 d8	fis4.
+	fis4 a8	fis8. e16 d8 |
+}
+fluteCpart = \fixed c'' {
+	\tag #'upbeat { fis8 | }
+	a,4 a,8	b,8. a,16 g,8 |
+	a,8. a,16 a,8	fis4. |
+}
+
+fluteDpart = \fixed c'' {
+	\tag #'upbeat { fis16. g32 | }
+	a8. fis16 e8	d8. e16 fis8 |
+	a,8. a,16 a,8	fis4. |
+}
+
+flutePart = \new Staff \with {
+  instrumentName = "Fl."
+  midiInstrument = "flute"
+} {
+	\global
+	\repeat volta 2 { \partial 8 \fluteApart \fluteMid \removeWithTag #'upbeat { \fluteApart } \fluteEnd }
+	\break
+	\repeat volta 2 { \partial 8 \fluteBpart \fluteMid \removeWithTag #'upbeat { \fluteBpart } \fluteEnd }
+	\break
+	\repeat volta 2 { \partial 8 \fluteCpart \fluteMid \removeWithTag #'upbeat { \fluteCpart } \fluteEnd }
+	\break
+	\repeat volta 2 { \partial 8 \fluteDpart \fluteMid }
+	\alternative { \removeWithTag #'upbeat { \fluteDpart \fluteEnd} \removeWithTag #'upbeat { \fluteCpart \fluteEnd } }
+	\bar "|."
+}
+
+\score {
+	<<
+		\flutePart
+	>>
+	\layout { }
+}
+
+\score {
+	\unfoldRepeats \removeWithTag #'midiRemove {
+		\flutePart
+	}
+	\midi {
+		\bpm
+	}
+}
diff --git a/book/book.lytex b/book/book.lytex
index b4a1198..f1a76a7 100644
--- a/book/book.lytex
+++ b/book/book.lytex
@@ -38,6 +38,14 @@
 \chapterstart
 \chapter{6/8 Marches}
 
+\noindent
+\begin{minipage}{\columnwidth}
+\noindent
+\addcontentsline{toc}{subsection}{Heights of Cassino, The}
+\lilypondfile{./6-8_marches/the_heights_of_cassino.ly}
+\end{minipage}
+\vspace{.5in}
+
 \noindent
 \begin{minipage}{\columnwidth}
 \noindent