From 0595d0294ef1b2f90f08151bbf90ed33a6c324e5 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 26 Jul 2022 23:43:19 +0200
Subject: [PATCH] Mull of Kintyre: use Fine instead of DCalFine

---
 airs/mull_of_kintyre/full.ly         |  3 +--
 airs/mull_of_kintyre/lyrics.pipes.ly | 10 ++++++++--
 airs/mull_of_kintyre/pipes.ly        | 10 ++++++++--
 airs/mull_of_kintyre/side.ly         |  2 ++
 airs/mull_of_kintyre/tenor.ly        |  4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/airs/mull_of_kintyre/full.ly b/airs/mull_of_kintyre/full.ly
index 6932bf3..e521e05 100644
--- a/airs/mull_of_kintyre/full.ly
+++ b/airs/mull_of_kintyre/full.ly
@@ -39,13 +39,12 @@
 						  \measure
 						}
 
-						\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
-						\mark \markup { \small "D.C. al fine" }
 						\measure
 						\break
 
 					}
 					% Dunno
+					\markText "Fine"
 					\repeat unfold 6 {
 					  \measure
 					}
diff --git a/airs/mull_of_kintyre/lyrics.pipes.ly b/airs/mull_of_kintyre/lyrics.pipes.ly
index 12acb19..ae20a68 100644
--- a/airs/mull_of_kintyre/lyrics.pipes.ly
+++ b/airs/mull_of_kintyre/lyrics.pipes.ly
@@ -6,6 +6,12 @@
 \include "./notes.pipes.ily"
 \include "./notes.lyrics.ily"
 
+% From Svenax's bagpipemusic
+markText = #(define-music-function (parser location text) (string?) #{
+    \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \mark \markup $text
+#})
+
 \score {
     \new Staff {
 		\global
@@ -28,13 +34,13 @@
 					\repeat unfold 4 {
 					  \measure
 					}
-					\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
-					\mark \markup { \small "D.C. al fine" }
+
 					\measure
 					\break
 
 				}
 				% Dunno
+				\markText "Fine"
 				\repeat unfold 6 {
 				  \measure
 				}
diff --git a/airs/mull_of_kintyre/pipes.ly b/airs/mull_of_kintyre/pipes.ly
index d4a679d..30c8b8c 100644
--- a/airs/mull_of_kintyre/pipes.ly
+++ b/airs/mull_of_kintyre/pipes.ly
@@ -5,6 +5,12 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
+% From Svenax's bagpipemusic
+markText = #(define-music-function (parser location text) (string?) #{
+    \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \mark \markup $text
+#})
+
 \score {
     \new Staff {
 		\global
@@ -26,13 +32,13 @@
 					\repeat unfold 4 {
 					  \measure
 					}
-					\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
-					\mark \markup { \small "D.C. al fine" }
+
 					\measure
 					\break
 
 				}
 				% Dunno
+				\markText "Fine"
 				\repeat unfold 6 {
 				  \measure
 				}
diff --git a/airs/mull_of_kintyre/side.ly b/airs/mull_of_kintyre/side.ly
index 80a0d6d..b9a06c1 100644
--- a/airs/mull_of_kintyre/side.ly
+++ b/airs/mull_of_kintyre/side.ly
@@ -26,10 +26,12 @@
 					\repeat unfold 4 {
 						\measure
 					}
+
 					\measure
 					\break
 				}
 				% Dunno
+				\markText "Fine"
 				\repeat unfold 6 {
 				  \measure
 				}
diff --git a/airs/mull_of_kintyre/tenor.ly b/airs/mull_of_kintyre/tenor.ly
index 30cab0d..c836027 100644
--- a/airs/mull_of_kintyre/tenor.ly
+++ b/airs/mull_of_kintyre/tenor.ly
@@ -26,13 +26,13 @@
 					\repeat unfold 4 {
 					  \measure
 					}
-					\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
-					\mark \markup { \small "D.C. al fine" }
+
 					\measure
 					\break
 
 				}
 				% Dunno
+				\markText "Fine"
 				\repeat unfold 6 {
 				  \measure
 				}