From af4934d4ab69a9e1934f06d7343ad6c03e146578 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sat, 27 Jan 2018 09:00:43 +0100 Subject: [PATCH] Changed standard structure for Kilaloe --- 6-8_marches/kilaloe/full.ly | 37 ++++---- 6-8_marches/kilaloe/full.n.ly | 127 ---------------------------- 6-8_marches/kilaloe/notes.tenor.ily | 10 +-- 6-8_marches/kilaloe/pipes.ly | 59 +++++-------- 6-8_marches/kilaloe/pipes.n.ly | 50 ----------- 6-8_marches/kilaloe/tenor.ly | 12 +-- 6 files changed, 50 insertions(+), 245 deletions(-) delete mode 100644 6-8_marches/kilaloe/full.n.ly delete mode 100644 6-8_marches/kilaloe/pipes.n.ly diff --git a/6-8_marches/kilaloe/full.ly b/6-8_marches/kilaloe/full.ly index fd36d00..7357983 100644 --- a/6-8_marches/kilaloe/full.ly +++ b/6-8_marches/kilaloe/full.ly @@ -11,6 +11,7 @@ %\include "./notes.pipes.seconds.ily" %\include "./notes.lyrics.ily" +part = { \partial 4. \grace {s4} s4. } \score { \new StaffGroup << \new Staff \with { @@ -24,29 +25,29 @@ \part \line \break - \line \bar "!" - \break - \line - \break \line \bar "||" \break + \part + \line + \break + \line \bar ".|:-||" + \break \repeat volta 2 { + \part \line \break \line - s4. + \measure } - \alternative{ {\grace {s4} s4. } {\grace {s4} s4. } } - \bar "|." }%Format \new Voice = "pipes" { - \pipesA + r4 \pipesA s4. - \pipesB + \pipesB s4. - \pipesC \pipesCBA \pipesCBB + \pipesC s4. }%Pipes >> } @@ -83,15 +84,15 @@ } { \tenorglobal - s8 \tenorAA r4. - \tenorAB r4. + r4. \tenorAA + \tenorAB + + r4. \tenorAA + \tenorAB - \tenorAA r4. - \tenorAB r4. - - \tenorBA r4. - \tenorBB r4. - r4. | % Volta bracket for pipes + r4. \tenorBA + \tenorBB + | % Volta bracket for pipes } % \new PipeBandDrumStaff = "bass" \with { % instrumentName = \markup{ \instrumentBass } diff --git a/6-8_marches/kilaloe/full.n.ly b/6-8_marches/kilaloe/full.n.ly deleted file mode 100644 index 5988e06..0000000 --- a/6-8_marches/kilaloe/full.n.ly +++ /dev/null @@ -1,127 +0,0 @@ -\version "2.19.0" - -\include "bagpipe.ly" -\include "lilydrum.ly" - -\include "./config.ily" -%\include "./notes.bass.ily" -\include "./notes.tenor.ily" -%\include "./notes.side.ily" -\include "./notes.pipes.ily" -%\include "./notes.pipes.seconds.ily" -%\include "./notes.lyrics.ily" - -part = { \partial 4. \grace {s4} s4. } -\score { - \new StaffGroup << - \new Staff \with { - instrumentName = \markup{ \instrumentPipes } - shortInstrumentName = \markup{ \shortInstrumentPipes } - } { - \global - \pipeglobal - << - \new NullVoice = "format" { - \part - \line - \break - \line \bar "!" - \break - \part - \line - \break - \line \bar ".|:-||" - \break - \repeat volta 2 { - \part - \line - \break - \line - \measure - } - - }%Format - - \new Voice = "pipes" { - r4 \pipesA s4. - - \pipesB s4. - - \pipesC s4. - }%Pipes - >> - } -% \new Staff = "song" { -% \lyricsglobal -% \new Voice = "lyrics" { -% -% } -% } -% \new Lyrics = "verse1" { -% \lyricsglobal -% \lyricsto "lyrics" { -% \verseA -% } -% } -% \new Staff = "seconds" \with { -% instrumentName = \markup{ \instrumentPipes \instrumentSecnd } -% shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd } -% } { -% \pipessecndglobal -% -% -% } -% \new PipeBandDrumStaff = "side" \with { -% instrumentName = \markup { \instrumentSide } -% shortInstrumentName = \markup{ \shortInstrumentSide } -% } { -% \sideglobal -% -% } - \new PipeBandDrumStaff = "tenor" \with { - instrumentName = \markup{ \instrumentTenor } - shortInstrumentName = \markup{ \shortInstrumentTenor } - } { - \tenorglobal - - r4. \tenorAA r4. - \tenorAB s4. - - r4. \tenorAA r4. - \tenorAB s4. - - r4. \tenorBA r4. - \tenorBB s4. - | % Volta bracket for pipes - } -% \new PipeBandDrumStaff = "bass" \with { -% instrumentName = \markup{ \instrumentBass } -% shortInstrumentName = \markup{ \shortInstrumentBass } -% } { -% \bassglobal -% -% } - >> - \header { - title = \title - meter = \meter - composer = \markup \large { - \column \right-align { - $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \composerPipessecnd ":" }} #} ) - $(if (not (string=? "" composerSide)) #{ \markup {\line { \composerSide ":" }} #} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor ":" }} #} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \composerBass ":" }} #} ) - } - \column \right-align { - $(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} ) - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) - $(if (not (string=? "" composerPipessecnd)) #{ \markup {\line { \instrumentPipessecnd }}#} ) - $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily index 9b6da4d..ba1e2ec 100644 --- a/6-8_marches/kilaloe/notes.tenor.ily +++ b/6-8_marches/kilaloe/notes.tenor.ily @@ -10,7 +10,7 @@ tenorAA = \drummode { d4. g4. | d4. r4.\rswipe | d4. g4. | d4. r4.\rswipe | d4. g4. | d4. g4. | - d4.\up g4.\up | d4.\up + d4.\up g4.\up | d4.\up r4. | } tenorAB = \drummode { \flourish{ @@ -18,17 +18,17 @@ tenorAB = \drummode { d4. d4. | g4. g4. | d4. d4. | g4. g4. | } - d4.\up g4.\up | d4.\up + d4.\up g4.\up | d4.\up r4. | } tenorBA = \drummode { \tenorAA } tenorBB = \drummode { - \flourish{ + \flourish{ d4. d4. | g4. g4. | d4. d4. | g4. g4. | d4. d4. | g4. g4. | } - r4.^\markup{Yell} r4. | - d4.\up g4.\up | d4.\up + r4. r4. | + d4.\up g4.\up | d4.\up r4. | } diff --git a/6-8_marches/kilaloe/pipes.ly b/6-8_marches/kilaloe/pipes.ly index 5001ca8..2949465 100644 --- a/6-8_marches/kilaloe/pipes.ly +++ b/6-8_marches/kilaloe/pipes.ly @@ -5,36 +5,38 @@ \include "./config.ily" \include "./notes.pipes.ily" +part = { \partial 4. \grace {s4} s4. } + \score { \new Staff { \global \pipeglobal << - { - \part - \line - \break - \line \bar "|." - \break - \line - \break - \line \bar "|." - \break - \repeat volta 2 { + \new NullVoice = "format" { + \part \line \break + \line \bar "||" + \break + \part \line - s4. - } - \alternative{ {\grace{s4} s4.} {\grace{s4} s4.} } - \bar "|." + \break + \line \bar ".|:-||" + \break + \repeat volta 2 { + \part + \line + \break + \line + \measure + } }%Format { - \pipesA + r4 \pipesA s4. - \pipesB + \pipesB s4. - \pipesC \pipesCBA \pipesCBB + \pipesC s4. } >> @@ -46,24 +48,3 @@ composer = \composerPipes } } -\score { - \new Staff { \global \pipeglobal - \set Staff.midiInstrument = #"bagpipe" - %%Tune - - \partial 8 - \pipesA - - \pipesB - - \pipesC \pipesC \pipesCBB - - } - \midi { \confTempo } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} diff --git a/6-8_marches/kilaloe/pipes.n.ly b/6-8_marches/kilaloe/pipes.n.ly deleted file mode 100644 index c6d1f2b..0000000 --- a/6-8_marches/kilaloe/pipes.n.ly +++ /dev/null @@ -1,50 +0,0 @@ -\version "2.18.2" - -\include "bagpipe.ly" - -\include "./config.ily" -\include "./notes.pipes.ily" - -part = { \partial 4. \grace {s4} s4. } - -\score { - \new Staff { - \global - \pipeglobal - << - { - \part - \line - \break - \line \bar "!" - \break - \part - \line - \break - \line \bar ".|:-||" - \break - \repeat volta 2 { - \part - \line - \break - \line - \measure - } - }%Format - { - r4 \pipesA s4. - - \pipesB s4. - - \pipesC s4. - - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly index d38a8a3..783962c 100644 --- a/6-8_marches/kilaloe/tenor.ly +++ b/6-8_marches/kilaloe/tenor.ly @@ -11,17 +11,17 @@ \tenorglobal << \new NullVoice = "format" { - \repeat volta 2 { \line \break \line } + \repeat volta 2 { \line \line } \break - \repeat volta 2 { \line \break \line \measure } + \repeat volta 2 { \line \line s2. } }%Format \new DrumVoice = "tenor" { - \tenorAA r4. - \tenorAB r4. + \tenorAA + \tenorAB - \tenorBA r4. - \tenorBB r4. + \tenorBA + \tenorBB } >> }