From 570f941654dedd981097725906b9ec797728e998 Mon Sep 17 00:00:00 2001 From: Sven Axelsson Date: Sun, 10 Oct 2010 18:32:48 +0200 Subject: [PATCH] Added minimal-breaking to all sets. --- ...ractise.ly => !2-4_marches_for_practise.ly} | 8 ++++---- ...trasbourg.ly => !medley_2008_strasbourg.ly} | 6 ++++-- ...en_grade.ly => !quintet_2006_open_grade.ly} | 6 ++++-- _sets/!quintet_2011_msr_open_grade.ly | 15 +++++++++++++++ ..._for_practise.ly => !reels_for_practise.ly} | 8 ++++---- ...ractise.ly => !strathspeys_for_practise.ly} | 14 +++++++------- _sets/2-4_marches.ly | 18 ++++++++++-------- _sets/3-4_marches.ly | 6 ++++-- _sets/4-4_marches_1.ly | 6 ++++-- _sets/4-4_marches_2.ly | 6 ++++-- _sets/4-4_marches_3.ly | 6 ++++-- _sets/6-8_marches_1.ly | 6 ++++-- _sets/6-8_marches_2.ly | 6 ++++-- _sets/9-8_marches.ly | 6 ++++-- _sets/christmas.ly | 6 ++++-- 15 files changed, 80 insertions(+), 43 deletions(-) rename _sets/{2-4_marches_for_practise.ly => !2-4_marches_for_practise.ly} (97%) rename _sets/{medley_2008_strasbourg.ly => !medley_2008_strasbourg.ly} (94%) rename _sets/{quintet_2006_open_grade.ly => !quintet_2006_open_grade.ly} (87%) create mode 100644 _sets/!quintet_2011_msr_open_grade.ly rename _sets/{reels_for_practise.ly => !reels_for_practise.ly} (94%) rename _sets/{strathspeys_for_practise.ly => !strathspeys_for_practise.ly} (87%) diff --git a/_sets/2-4_marches_for_practise.ly b/_sets/!2-4_marches_for_practise.ly similarity index 97% rename from _sets/2-4_marches_for_practise.ly rename to _sets/!2-4_marches_for_practise.ly index 38e1c08..c571cda 100644 --- a/_sets/2-4_marches_for_practise.ly +++ b/_sets/!2-4_marches_for_practise.ly @@ -2,6 +2,10 @@ title = "2/4 Marches for practise" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \markuplines \table-of-contents \pageBreak @@ -130,7 +134,3 @@ %\tocItem \markup "The Young MacGregor" %\include "2-4_marches/young_macgregor.ly" %\pageBreak - -% Throwaway to make page breaking work -\include "2-4_marches/teribus.ly" -\pageBreak diff --git a/_sets/medley_2008_strasbourg.ly b/_sets/!medley_2008_strasbourg.ly similarity index 94% rename from _sets/medley_2008_strasbourg.ly rename to _sets/!medley_2008_strasbourg.ly index 7f0ef9e..4d19d44 100644 --- a/_sets/medley_2008_strasbourg.ly +++ b/_sets/!medley_2008_strasbourg.ly @@ -1,9 +1,11 @@ - - \header { title = "2008 Medley for Strasbourg" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \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" diff --git a/_sets/quintet_2006_open_grade.ly b/_sets/!quintet_2006_open_grade.ly similarity index 87% rename from _sets/quintet_2006_open_grade.ly rename to _sets/!quintet_2006_open_grade.ly index 2f69a03..f9f0ad2 100644 --- a/_sets/quintet_2006_open_grade.ly +++ b/_sets/!quintet_2006_open_grade.ly @@ -1,10 +1,12 @@ - - \header { title = "Open Grade Quintet 2006" dedication = "Mats, Sven, Daniel, Eugen, Marie" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "reels/me_clootch_is_awee.ly" \include "piobaireachd/his_fathers_lament_for_donald_mackenzie.ly" \pageBreak diff --git a/_sets/!quintet_2011_msr_open_grade.ly b/_sets/!quintet_2011_msr_open_grade.ly new file mode 100644 index 0000000..16c00e3 --- /dev/null +++ b/_sets/!quintet_2011_msr_open_grade.ly @@ -0,0 +1,15 @@ +\header { + title = "Open Grade Quintet (MSR) 2011" + dedication = "Mats, Sven, Christian, Eugen, Marie" +} + +\paper { + #(define page-breaking ly:minimal-breaking) +} + +\include "2-4_marches/brigadier_general_ronald_cheape_of_tiroran.ly" +\pageBreak +\include "strathspeys/ewe_with_the_crooked_horn.ly" +\pageBreak +\include "reels/miss_proud.ly" + diff --git a/_sets/reels_for_practise.ly b/_sets/!reels_for_practise.ly similarity index 94% rename from _sets/reels_for_practise.ly rename to _sets/!reels_for_practise.ly index a2c887d..be103bb 100644 --- a/_sets/reels_for_practise.ly +++ b/_sets/!reels_for_practise.ly @@ -2,6 +2,10 @@ title = "Reels for practise" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \markuplines \table-of-contents \pageBreak @@ -69,7 +73,3 @@ %\tocItem \markup "Thomson’s Dirk" %\include "reels/thonsons_dirk.ly" %\pageBreak - -% Throwaway to make page breaking work -\include "2-4_marches/teribus.ly" -\pageBreak diff --git a/_sets/strathspeys_for_practise.ly b/_sets/!strathspeys_for_practise.ly similarity index 87% rename from _sets/strathspeys_for_practise.ly rename to _sets/!strathspeys_for_practise.ly index 086fb91..c0a2452 100644 --- a/_sets/strathspeys_for_practise.ly +++ b/_sets/!strathspeys_for_practise.ly @@ -2,6 +2,10 @@ title = "Strathspeys for practise" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \markuplines \table-of-contents \pageBreak @@ -30,9 +34,9 @@ %\include "strathspeys/delvin_side.ly" %\pageBreak -%\tocItem \markup "The Ewe wi’ the Crookit Horn" -%\include "strathspeys/ewe_wi_the_crookit_horn.ly" -%\pageBreak +\tocItem \markup "The Ewe With the Crooked Horn" +\include "strathspeys/ewe_with_the_crooked_horn.ly" +\pageBreak \tocItem \markup "Inverary Castle" \include "strathspeys/inverary_castle.ly" @@ -64,7 +68,3 @@ \tocItem \markup "Tulloch Gorm" \include "strathspeys/tulloch_gorm.ly" \pageBreak - -% Throwaway to make page breaking work -\include "2-4_marches/teribus.ly" -\pageBreak diff --git a/_sets/2-4_marches.ly b/_sets/2-4_marches.ly index 6831110..e5f1fa1 100644 --- a/_sets/2-4_marches.ly +++ b/_sets/2-4_marches.ly @@ -1,8 +1,10 @@ - - -\header { - title = "2/4 Marches" -} - -\include "2-4_marches/corriechoillie.ly" -\include "2-4_marches/teribus.ly" +\header { + title = "2/4 Marches" +} + +\paper { + #(define page-breaking ly:minimal-breaking) +} + +\include "2-4_marches/corriechoillie.ly" +\include "2-4_marches/teribus.ly" diff --git a/_sets/3-4_marches.ly b/_sets/3-4_marches.ly index 09041e6..be2b849 100644 --- a/_sets/3-4_marches.ly +++ b/_sets/3-4_marches.ly @@ -1,8 +1,10 @@ - - \header { title = "3/4 Marches" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "3-4_marches/green_hills_of_tyrol.ly" \include "3-4_marches/when_the_battle_is_over.ly" diff --git a/_sets/4-4_marches_1.ly b/_sets/4-4_marches_1.ly index 2bdb20c..eb4cd2a 100644 --- a/_sets/4-4_marches_1.ly +++ b/_sets/4-4_marches_1.ly @@ -1,9 +1,11 @@ - - \header { title = "4/4 Marches Set 1" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "4-4_marches/scotland_the_brave.ly" \include "4-4_marches/badge_of_scotland.ly" \include "4-4_marches/rowan_tree.ly" diff --git a/_sets/4-4_marches_2.ly b/_sets/4-4_marches_2.ly index 7f441d3..c81a9f8 100644 --- a/_sets/4-4_marches_2.ly +++ b/_sets/4-4_marches_2.ly @@ -1,9 +1,11 @@ - - \header { title = "4/4 Marches Set 2" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "4-4_marches/silver_wings.ly" \include "4-4_marches/lord_lovats_lament.ly" \pageBreak diff --git a/_sets/4-4_marches_3.ly b/_sets/4-4_marches_3.ly index 4bbdfab..dc5d067 100644 --- a/_sets/4-4_marches_3.ly +++ b/_sets/4-4_marches_3.ly @@ -1,9 +1,11 @@ - - \header { title = "4/4 Marches Set 3" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "4-4_marches/boys_brigade_centenary_march.ly" \pageBreak \include "4-4_marches/cabar_feidh.ly" diff --git a/_sets/6-8_marches_1.ly b/_sets/6-8_marches_1.ly index 0aca4ab..af4a276 100644 --- a/_sets/6-8_marches_1.ly +++ b/_sets/6-8_marches_1.ly @@ -1,9 +1,11 @@ - - \header { title = "6/8 Marches Set 1" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "6-8_marches/atholl_highlanders.ly" \pageBreak \include "6-8_marches/cock_of_the_north.ly" diff --git a/_sets/6-8_marches_2.ly b/_sets/6-8_marches_2.ly index ee1625d..d0ba274 100644 --- a/_sets/6-8_marches_2.ly +++ b/_sets/6-8_marches_2.ly @@ -1,9 +1,11 @@ - - \header { title = "6/8 Marches Set 2" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "6-8_marches/ballochyle.ly" \pageBreak \include "6-8_marches/!duncan_mcgillivray.ly" diff --git a/_sets/9-8_marches.ly b/_sets/9-8_marches.ly index 67da90d..348dd34 100644 --- a/_sets/9-8_marches.ly +++ b/_sets/9-8_marches.ly @@ -1,9 +1,11 @@ - - \header { title = "9/8 Marches" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "9-8_marches/battle_of_the_somme.ly" \include "9-8_marches/grinder.ly" \include "9-8_marches/heights_of_dargai.ly" diff --git a/_sets/christmas.ly b/_sets/christmas.ly index 7ea202c..1f52c50 100644 --- a/_sets/christmas.ly +++ b/_sets/christmas.ly @@ -1,9 +1,11 @@ - - \header { title = "Christmas Carols" } +\paper { + #(define page-breaking ly:minimal-breaking) +} + \include "others/come_all_ye_faithful.ly" \include "others/good_king_wenceslas.ly" \include "others/jingle_bells.ly"