Updated page breaking system.

Since version 2.11.45 the \pageBreak command can be used correctly at the top level, so the hack for this has been removed. Also updated the version in all files to 2.12.0 to indicate that we need a recent Lilypond.

_sets/4-4_marches_1.ly

@@ -6,5 +6,4 @@
 
 \include "4-4_marches/scotland_the_brave.ly"
 \include "4-4_marches/badge_of_scotland.ly"
-#(break-before-next-score)
 \include "4-4_marches/rowan_tree.ly"

_sets/4-4_marches_2.ly

@@ -1,4 +1,4 @@
-
+
 
 \header {
     title = "4/4 Marches Set 2"
@@ -6,6 +6,6 @@
 
 \include "4-4_marches/silver_wings.ly"
 \include "4-4_marches/lord_lovats_lament.ly"
-#(break-before-next-score)
-\include "4-4_marches/flett_from_flotta.ly"
+\pageBreak
+\include "4-4_marches/!flett_from_flotta.ly"
 \include "4-4_marches/braes_of_bonhill.ly"

_sets/4-4_marches_3.ly

@@ -1,9 +1,9 @@
-
+
 
 \header {
     title = "4/4 Marches Set 3"
 }
 
 \include "4-4_marches/boys_brigade_centenary_march.ly"
-#(break-before-next-score)
+\pageBreak
 \include "4-4_marches/cabar_feidh.ly"

_sets/6-8_marches_1.ly

@@ -1,9 +1,9 @@
-
+
 
 \header {
     title = "6/8 Marches Set 1"
 }
 
 \include "6-8_marches/atholl_highlanders.ly"
-#(break-before-next-score)
+\pageBreak
 \include "6-8_marches/cock_of_the_north.ly"

_sets/6-8_marches_2.ly

@@ -1,9 +1,9 @@
-
+
 
 \header {
     title = "6/8 Marches Set 2"
 }
 
 \include "6-8_marches/ballochyle.ly"
-#(break-before-next-score)
-\include "6-8_marches/duncan_mcgillivray.ly"
+\pageBreak
+\include "6-8_marches/!duncan_mcgillivray.ly"

_sets/9-8_marches.ly

@@ -7,7 +7,3 @@
 \include "9-8_marches/battle_of_the_somme.ly"
 \include "9-8_marches/grinder.ly"
 \include "9-8_marches/heights_of_dargai.ly"
-
-\paper {
-  between-system-space = 15\mm
-}

_sets/christmas.ly

@@ -1,4 +1,4 @@
-
+
 
 \header {
     title = "Christmas Carols"
@@ -7,7 +7,3 @@
 \include "others/come_all_ye_faithful.ly"
 \include "others/good_king_wenceslas.ly"
 \include "others/jingle_bells.ly"
-
-\paper {
-  between-system-space = 15\mm
-}

_sets/medley_2008_strasbourg.ly

@@ -4,17 +4,17 @@
     title = "2008 Medley for Strasbourg"
 }
 
-\markuplines{\wordwrap{Four bars jig intro, then first four bars extending the 
+\markuplines{\wordwrap{Four bars jig intro, then first four bars extending the
     last note of bar 2 and 4 by four extra beats, then start again from the top.}}
 \include "jigs/archie_beag.ly"
 \include "airs/mist_covered_mountains.ly"
 
-#(break-before-next-score)
+\pageBreak
 \include "strathspeys/unknown.ly"
 \include "strathspeys/mac_an_irish.ly"
 \include "scandinavian/harp_schottis.ly"
 
-#(break-before-next-score)
+\pageBreak
 \include "reels/airlies_big_day.ly"
 \include "reels/foot_it_neatly.ly"
 \include "piobaireachd/lament_for_the_harp_tree.ly"
@@ -22,11 +22,11 @@
 \markuplines{\wordwrap{Hold the cluster for 10 seconds or so, start with cuttings
     from the top, one set of unison cuttings before the tune starts.}}
 
-#(break-before-next-score)
+\pageBreak
 \include "jigs/braes_of_mellinish.ly"
 
 \markuplines{\wordwrap{Cluster like before, one single beat in jig tempo then
     break immediately into hornpipe.}}
 
-#(break-before-next-score)
-\include "suites/murrays_fancy_6_hornpipe.ly"
+\pageBreak
+\include "suites/murrays_fancy_6_hornpipe.ly"

_sets/quintet_2006_open_grade.ly

@@ -1,4 +1,4 @@
-
+
 
 \header {
     title = "Open Grade Quintet 2006"
@@ -7,12 +7,12 @@
 
 \include "reels/me_clootch_is_awee.ly"
 \include "piobaireachd/his_fathers_lament_for_donald_mackenzie.ly"
-#(break-before-next-score)
+\pageBreak
 \include "strathspeys/unknown.ly"
 \include "reels/macleods_reel.ly"
-#(break-before-next-score)
+\pageBreak
 \include "reels/joes_rant.ly"
-#(break-before-next-score)
+\pageBreak
 \include "reels/sheepwife.ly"
-#(break-before-next-score)
+\pageBreak
 \include "jigs/fiddlers_rally_mpdset.ly"

cheatsheet.ly

@@ -2,7 +2,7 @@
     All of the bagpipe specific markup.
 %}
 
-\version "2.11.43"
+\version "2.12.0"
 
 #(ly:set-option 'point-and-click #f)
 

format.ly

@@ -2,7 +2,7 @@
     Header formatting for bagpipe tunes. Customize to get your name in the tag line.
 %}
 
-\version "2.11.43"
+\version "2.12.0"
 
 % Bring in the time/date package. Set format to month day, year
 

formatbook.ly

@@ -2,7 +2,7 @@
     Header formatting for bagpipe tunes. Customize to get your name in the tag line.
 %}
 
-\version "2.11.43"
+\version "2.12.0"
 
 % Bring in the time/date package. Set format to month day, year