From cd2c2835a52b451c76ce76f54b085e96b220fc6a Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Sat, 1 Feb 2020 15:50:53 +0100
Subject: [PATCH] Slight improvements in typesetting

---
 3-4_marches/torosay_castle/notes.pipes.ily    |  2 +-
 4-4_marches/cabar_feidh/pipes.agira.ly        | 25 +++----------------
 .../heights_of_cassino/notes.pipes.ily        |  4 +--
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/3-4_marches/torosay_castle/notes.pipes.ily b/3-4_marches/torosay_castle/notes.pipes.ily
index 4cc97c3..b5024db 100644
--- a/3-4_marches/torosay_castle/notes.pipes.ily
+++ b/3-4_marches/torosay_castle/notes.pipes.ily
@@ -49,7 +49,7 @@ pipesD = {
  \grg A8 [ c8 ] \thrwd d4 \dblA A4 | 
 
  f8. [ g16 ] \dblA A4 \thrwd d4 |
- \grg d16 [ e16 ] \grg d16 [ b16 ] \dblc c4 \dblA A4 |
+ \grg d16 [ e16 \grg d16 b16 ] \dblc c4 \dblA A4 |
  \grg A8 [ c8 ] \grip c4 \dblA A4 |
  \grg A16 [ g16 f16 e16 ] \thrwd d4 \dbld d4
 }
diff --git a/4-4_marches/cabar_feidh/pipes.agira.ly b/4-4_marches/cabar_feidh/pipes.agira.ly
index fb4bc56..1fca8ea 100644
--- a/4-4_marches/cabar_feidh/pipes.agira.ly
+++ b/4-4_marches/cabar_feidh/pipes.agira.ly
@@ -9,28 +9,11 @@
     \new Staff {
 		\global
 		\pipeglobal
-		<<
-			\new NullVoice = "format" {
-				\repeat unfold 4 {
-				  	\part
-					\halfline
-					\break
-					\halfline
-					\bar "||"
-				  \break
-				}
-				\bar "|."
-			}%Format
-			\new Voice = "pipes" {
-				\pipesAgiraA s8
 
-				\pipesAgiraB s8
-
-				\pipesAgiraC s8
-
-				\pipesAgiraD s8
-			}
-		>>
+		\partial 8 \pipesAgiraA \bar "||" \break
+		\partial 8 \pipesAgiraB \bar "||" \break
+		\partial 8 \pipesAgiraC \bar "||" \break
+		\partial 8 \pipesAgiraD \bar "|." \break
 	}
 	\header {
 		title = \titleAgira
diff --git a/6-8_marches/heights_of_cassino/notes.pipes.ily b/6-8_marches/heights_of_cassino/notes.pipes.ily
index 7752ddb..cf09050 100644
--- a/6-8_marches/heights_of_cassino/notes.pipes.ily
+++ b/6-8_marches/heights_of_cassino/notes.pipes.ily
@@ -51,13 +51,13 @@ pipesCB = {
 
 pipesDA = {
 	\hslurg g8 |
-	A8. f16 \grg e8	\thrwd d8. e16 8 |
+	A8. f16 \grg e8	\thrwd d8. e16 f8 |
 	\grg a4 \taor a8	\dblf f4. |
 	\grg f4 A8	\hdblf f8. e16 d8 |
 	\grg e16 f8. e8	\dbld d8. \grg b16 \grd G8 |
 }
 pipesDBA = {
-	A8. f16 \grg e8	\thrwd d8. e16 8 |
+	A8. f16 \grg e8	\thrwd d8. e16 f8 |
 	\grg a4 \taor a8	\dblf f4.
 	\dblf f4 \birl a8	\grg e16 f8. e8 |
 	\thrwd d4.	\wslurd d4