From 164b8225bd1689ddd27438d62f3a650f9f7860ac Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 24 May 2016 11:24:04 +0200 Subject: [PATCH] Fixed layout, not yet written --- hornpipes/the_walrus/bass.ly | 2 +- hornpipes/the_walrus/drums.ly | 27 +++++++++++++++++++++++++-- hornpipes/the_walrus/notes.tenor.ily | 3 ++- hornpipes/the_walrus/tenor.ly | 16 ++++++++++++++-- standards/standards.bass.ly | 7 ++++--- standards/standards.tenor.ly | 8 +++----- 6 files changed, 49 insertions(+), 14 deletions(-) diff --git a/hornpipes/the_walrus/bass.ly b/hornpipes/the_walrus/bass.ly index 41446d6..3dd44dd 100644 --- a/hornpipes/the_walrus/bass.ly +++ b/hornpipes/the_walrus/bass.ly @@ -6,7 +6,7 @@ \score { \new PipeBandDrumStaff { \global - \tenorglobal + \bassglobal << {\repeat volta 2 { \part \line } \break diff --git a/hornpipes/the_walrus/drums.ly b/hornpipes/the_walrus/drums.ly index 4ad9532..34698d6 100644 --- a/hornpipes/the_walrus/drums.ly +++ b/hornpipes/the_walrus/drums.ly @@ -14,8 +14,31 @@ \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} << - { }%Format - { }%Music + { + \repeat volta 2 { \part \line } + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} +}%Format + { + \snareAA + \snareAB s8 + + \snareBA + \snareBBA s8 + \snareAB s8 + + \snareCA + \snareCBA s8 + \snareBBA + + }%Music >> } \new PipeBandDrumStaff = "bass" { diff --git a/hornpipes/the_walrus/notes.tenor.ily b/hornpipes/the_walrus/notes.tenor.ily index f572169..1bb54ac 100644 --- a/hornpipes/the_walrus/notes.tenor.ily +++ b/hornpipes/the_walrus/notes.tenor.ily @@ -2,5 +2,6 @@ % Tenor \version "2.18.2" composerTenor = "" +tenorglobal = {} tenorA = \drummode { -} \ No newline at end of file +} diff --git a/hornpipes/the_walrus/tenor.ly b/hornpipes/the_walrus/tenor.ly index a96bc97..3427bf0 100644 --- a/hornpipes/the_walrus/tenor.ly +++ b/hornpipes/the_walrus/tenor.ly @@ -6,8 +6,20 @@ \score { \new PipeBandDrumStaff { \global + \tenorglobal << - {} + { + \repeat volta 2 { \part \line } + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} + \break + \repeat volta 2 { \part \halfline} + \alternative{ {\halfline} {\halfline}} + } {} >> } @@ -17,4 +29,4 @@ instrument = \instrumentTenor composer = \composerTenor } -} \ No newline at end of file +} diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly index 65d30de..8ffa155 100644 --- a/standards/standards.bass.ly +++ b/standards/standards.bass.ly @@ -1,7 +1,5 @@ \version "2.18.2" -\include "lilydrum.ly" - \header { title = "Standards" instrument = "Bass" @@ -20,6 +18,7 @@ title = "2/4 Standard" } } +\break \score { \new PipeBandDrumStaff { \time 3/4 @@ -34,6 +33,7 @@ title = "3/4 Standard" } } +\break \score { \new PipeBandDrumStaff { \time 4/4 @@ -48,6 +48,7 @@ title = "4/4 Standard" } } +\break \score { \new PipeBandDrumStaff { \time 6/8 @@ -61,4 +62,4 @@ \header { title = "6/8 Standard" } -} \ No newline at end of file +} diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly index 41cdf81..d68cd5c 100644 --- a/standards/standards.tenor.ly +++ b/standards/standards.tenor.ly @@ -1,7 +1,5 @@ \version "2.18.2" -\include "lilydrum.ly" - \header { instrument = "Tenor" title = "Standards" @@ -41,7 +39,7 @@ title = "2/4 Standards" } } - +\break \score { \new PipeBandDrumStaff { \time 3/4 @@ -68,7 +66,7 @@ title = "3/4 Standards" } } - +\break \score { \new PipeBandDrumStaff { \time 4/4 @@ -95,7 +93,7 @@ title = "4/4 Standards" } } - +\break \score { \new PipeBandDrumStaff { \time 6/8