From 1a98cf304212bb2fc03f7dcf6403d589281c567f Mon Sep 17 00:00:00 2001
From: Leni Aniva <v@leni.sh>
Date: Tue, 27 Feb 2024 19:38:31 -0800
Subject: [PATCH] Maple Leaf Forever violin-viola duet

---
 anthems/maple-leaf-forever.ly | 66 ++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/anthems/maple-leaf-forever.ly b/anthems/maple-leaf-forever.ly
index 3e82c93..991010c 100644
--- a/anthems/maple-leaf-forever.ly
+++ b/anthems/maple-leaf-forever.ly
@@ -15,14 +15,14 @@ violinU = \fixed c' { \repeat volta 2 {
 	d4 f d'4. bf8 | g4  bf f2      | a4.   bf8 c'4 bf | a4 g f4. ef8 |
 	d4 f bf    bf | d'4 bf g a8(bf)| c'8 8 bf4 a g8(f)| f2   4   4   |
 	g4 f bf4.  f8 | g4  bf f4.  8  | g4 4 ef'4. d'8   | d'8 c'4. r4 f4 |
-	f'4  d' bf a  | g4  bf f4.  8  | g4 ef' d'4. c'8  | \partial 2. c'8 bf4. r4 |
+	f'4  d' bf a  | g4  bf f4.  8  | g4 ef' d'4. c'8  | \partial 2. c'8 bf4.(4) |
 
 	\section
 	\sectionLabel "Refrain"
 
 	\partial 4 f4 |
 	d4 f bf4. f8 | g4 bf f4. 8 | g4 g  ef'4. d'8 | d'8 c'4. r4 f |
-	f'4 d' bf a  | g4 bf f4. 8 | g4 ef' d'4. c'8 | \partial 2. c'8 bf4. r4 |
+	f'4 d' bf a  | g4 bf f4. 8 | g4 ef' d'4. c'8 | \partial 2. c'8 bf4.(4) |
 }}
 violinL = \fixed c' {
 	\tempo 4 = 110
@@ -33,14 +33,14 @@ violinL = \fixed c' {
 	bf,4 d f4. f8 | ef4 ef d2    | ef4. d8 ef4 d | e4 e f4. c8 |
 	bf,4 d d d    | f4  f  ef f  | f8 f e4 4 8(f)| c4 d ef ef  |
 	d4 4 4. 8     | ef4 ef d4. 8 | ef4 f g4.   8 | f8 4.(4) f4 |
-	f4 4 4 4      | ef4 ef d4. 8 | ef4 g f4. ef8 | \partial 2. ef8 d4. r4 |
+	f4 4 4 4      | ef4 ef d4. 8 | ef4 g f4. ef8 | \partial 2. ef8 d4.(4) |
 
 	\section
 	\sectionLabel "Refrain"
 
 	\partial 4 d4 |
 	bf,4 d4 4. 8 | ef4 ef d4. 8 | ef4 f g4. 8   | f8 4.(4) 4 |
-	f4   4 4 4   | ef4 4 d4. 8 | ef4 g f4. ef8 | \partial 2. ef8 d4. r4 |
+	f4   4 4 4   | ef4 4 d4. 8 | ef4 g f4. ef8 | \partial 2. ef8 d4.(4) |
 }
 
 %violin = \fixed c' { \repeat volta 2 {
@@ -56,7 +56,45 @@ violinL = \fixed c' {
 %	<bf, d>4 <d f> <d bf> | <f d'> <f bf> <ef g>
 %}}
 
-\score{
+\bookpart{ \score{
+	%\midi {
+	%	\context {
+	%		\Score
+	%		midiChannelMapping = #'instrument
+	%	}
+	%}
+	\layout {
+		\context {
+			\Score
+		}
+	}
+
+	<<
+	\new Staff \with {
+		instrumentName = "Violin 1"
+		shortInstrumentName = "V1"
+		midiInstrument = "violin"
+	} <<
+		\override Accidental.hide-tied-accidental-after-break = ##t
+		\new Voice = "violin" {
+			\violinU
+		}
+	>>
+	\new Staff \with {
+		instrumentName = "Violin 2"
+		shortInstrumentName = "V2"
+		midiInstrument = "violin"
+	} <<
+		\override Accidental.hide-tied-accidental-after-break = ##t
+		\new Voice = "violin" {
+			\violinL
+		}
+	>>
+	>>
+}}
+
+
+\bookpart{ \score{
 	\midi {
 		\context {
 			\Score
@@ -68,26 +106,28 @@ violinL = \fixed c' {
 			\Score
 		}
 	}
-	%\override Accidental.hide-tied-accidental-after-break = ##t
 
 	<<
 	\new Staff \with {
-		instrumentName = "Violin 1"
-		shortInstrumentName = "V1"
+		instrumentName = "Violin"
+		shortInstrumentName = "Vln."
 		midiInstrument = "violin"
 	} <<
+		\override Accidental.hide-tied-accidental-after-break = ##t
 		\new Voice = "violin" {
 			\violinU
 		}
 	>>
 	\new Staff \with {
-		instrumentName = "Violin 2"
-		shortInstrumentName = "V2"
-		midiInstrument = "violin"
+		instrumentName = "Viola"
+		shortInstrumentName = "Vla."
+		midiInstrument = "viola"
 	} <<
-		\new Voice = "violin" {
+		\override Accidental.hide-tied-accidental-after-break = ##t
+		\new Voice = "viola" {
+			\clef alto
 			\violinL
 		}
 	>>
 	>>
-}
+}}