From 5d8d6b96d4bb8744bcaac4aa806cd27a55ae9953 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 17 Sep 2019 18:05:55 +0200 Subject: [PATCH] Presentation fixes for some mid and full scores --- 4-4_marches/51st_highland_division/full.ly | 42 +++++++++++------- .../the_leaving_of_liverpool/config.ily | 2 +- 4-4_marches/the_leaving_of_liverpool/full.ly | 43 ++++++++++++------- 4-4_marches/the_old_rustic_bridge/full.ly | 19 +++++--- airs/alexander_mackenzie/mid.ly | 11 +++-- 5 files changed, 75 insertions(+), 42 deletions(-) diff --git a/4-4_marches/51st_highland_division/full.ly b/4-4_marches/51st_highland_division/full.ly index 4a83b2e..7cac8f4 100644 --- a/4-4_marches/51st_highland_division/full.ly +++ b/4-4_marches/51st_highland_division/full.ly @@ -9,13 +9,19 @@ \include "./notes.side.ily" \include "./notes.pipes.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \repeat unfold 2 { @@ -39,10 +45,11 @@ }%Pipes >> } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup { \instrumentSide } + shortInstrumentName = \markup{ \shortInstrumentSide } + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \repeat unfold 2 { s8 \snareA @@ -59,25 +66,28 @@ } - \new PipeBandDrumStaff = "tenor" { + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - + \repeat unfold 2 { \repeat unfold 2 { s8 \tenorAA r8 \tenorAB r8 s8 } } + } +%{ + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { + \bassglobal } -% \new PipeBandDrumStaff = "bass" { -% \bassglobal -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -% -% } +%} >> \header { title = \title diff --git a/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily index d1321c0..93d4c13 100644 --- a/4-4_marches/the_leaving_of_liverpool/config.ily +++ b/4-4_marches/the_leaving_of_liverpool/config.ily @@ -5,7 +5,7 @@ global = { \key a \mixolydian } %% Format -part = { \partial 4 s4 } +part = { \partial 4 \grace {s4} s4 } measure = { \grace { s4 } s1 | } halfline = { \repeat unfold 2 { \measure } } line = { \repeat unfold 2 { \halfline } } diff --git a/4-4_marches/the_leaving_of_liverpool/full.ly b/4-4_marches/the_leaving_of_liverpool/full.ly index 6a12449..bb65b48 100644 --- a/4-4_marches/the_leaving_of_liverpool/full.ly +++ b/4-4_marches/the_leaving_of_liverpool/full.ly @@ -9,17 +9,23 @@ \include "./notes.side.ily" \include "./notes.pipes.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \repeat unfold 2 { - \partial 4 s4 + \part \line \break \line \bar "|." @@ -35,10 +41,11 @@ }%Pipes >> } - \new PipeBandDrumStaff = "side" { + \new PipeBandDrumStaff = "side" \with { + instrumentName = \markup { \instrumentSide } + shortInstrumentName = \markup{ \shortInstrumentSide } + } { \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \snareA \snareA s4 @@ -46,10 +53,11 @@ \snareBB s4 } - \new PipeBandDrumStaff = "tenor" { + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \repeat unfold 2 { \repeat unfold 2 { @@ -59,12 +67,15 @@ } } -% \new PipeBandDrumStaff = "bass" { -% \bassglobal -% \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } -% \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} -% -% } +%{ + \new PipeBandDrumStaff = "bass" \with { + instrumentName = \markup{ \instrumentBass } + shortInstrumentName = \markup{ \shortInstrumentBass } + } { + \bassglobal + + } +%} >> \header { title = \title diff --git a/4-4_marches/the_old_rustic_bridge/full.ly b/4-4_marches/the_old_rustic_bridge/full.ly index bedd640..959230f 100644 --- a/4-4_marches/the_old_rustic_bridge/full.ly +++ b/4-4_marches/the_old_rustic_bridge/full.ly @@ -9,13 +9,19 @@ %\include "./notes.side.ily" \include "./notes.pipes.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << - \new Staff { + \new Staff \with { + instrumentName = \markup{ \instrumentPipes } + shortInstrumentName = \markup{ \shortInstrumentPipes } + } { \global \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << { \part @@ -41,10 +47,11 @@ % \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} % % } - \new PipeBandDrumStaff = "tenor" { + \new PipeBandDrumStaff = "tenor" \with { + instrumentName = \markup{ \instrumentTenor } + shortInstrumentName = \markup{ \shortInstrumentTenor } + } { \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \repeat unfold 2 { r8. \tenorA diff --git a/airs/alexander_mackenzie/mid.ly b/airs/alexander_mackenzie/mid.ly index 1c991bb..7839c12 100644 --- a/airs/alexander_mackenzie/mid.ly +++ b/airs/alexander_mackenzie/mid.ly @@ -6,6 +6,11 @@ \include "./notes.bass.ily" \include "./notes.tenor.ily" +\layout { + indent = 5.0 + short-indent = 2.0 +} + \score { \new StaffGroup << \new PipeBandDrumStaff = "tenor" { @@ -15,13 +20,13 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } << { - \repeat volta 2 { \partial 16 s16 \halfline \break \halfline } \break + \repeat volta 2 { \partial 8 s8 \halfline \break \halfline } \break \repeat volta 2 { \part \halfline \break } \alternative{ {\part \halfline \break}{\part \halfline \break} } \bar "|." }%Format { - s16 \tenorAA r8 + r8 \tenorAA r8 \tenorAB s8 \tenorBA s8 @@ -35,7 +40,7 @@ \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - s16 \bassAA \bassAB + s8 \bassAA \bassAB s8 \bassBA s8 \bassBB s8 \bassAB