From 0220f74640dccf7b68c5469b5bcb7d6b0df4d154 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 14 Dec 2016 00:28:33 +0100 Subject: [PATCH] Quite a few errors fixed --- jigs/seaforth_sticks/notes.side.ily | 55 +++++---- strathspeys/molly_connell/drums.ly | 84 +++++++------ strathspeys/molly_connell/full.ly | 185 ++++++++++++++-------------- strathspeys/molly_connell/side.ly | 11 +- 4 files changed, 181 insertions(+), 154 deletions(-) diff --git a/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily index 7f518b8..bd449d9 100644 --- a/jigs/seaforth_sticks/notes.side.ily +++ b/jigs/seaforth_sticks/notes.side.ily @@ -2,6 +2,13 @@ % Side \version "2.18.2" composerSide = "" +arrangerSide = "" + +Y = #(define-music-function (parser location note) (ly:music?) + #{ + <>^"Y" $note + #} + ) snareA = \drummode { \flamd d8 g8 d8 \flamg g4 g8 | d16 g d g d8-> g8 d8 g8 | @@ -22,7 +29,7 @@ snareB = \drummode { d16) g d g d8-> g8 d8 g8 | \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ g8 | + d8 g8 \flamg d8 \flamg g4-^ g8 | d4.:32(-> d4.:32)(-> | d16) g d g d8-> g8 d8 g8 | @@ -32,14 +39,14 @@ snareB = \drummode { } %C snareC = \drummode { - d8:32( | - d4) \flamd d8 g8 d8 g8-^| + d8:32(\< | + d4)\! \flamd d8 g8 d8 g8-^| d16 g d g d8 g8 d8 g8 | \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | + d8 g8 \flamg d8 \flamg g4-^ d8:32(\< | - d4) \flamd d8 g8 d8 g8-^| + d4)\! \flamd d8 g8 d8 g8-^| d16 g d g d8-> g8 d8 g8 | d16 g d g d8-> g8 d8 g8 | @@ -48,11 +55,11 @@ snareC = \drummode { %D snareD = \drummode { g8 | - d4.:32(-> d8) g8 g8| - d4.:32(-> d8) g8 g8| + d4.:32(-> d8) g8 g8 | + d4.:32(-> d8) g8 g8 | - \flamd d8 g8 d8 \flamg g4 g8-^ | - d8 g8 \flamg g8-^ \flamg g4 g8 | + \flamd d8\> g8 d8 \flamg g4\! g8-\v | + d8\< g8 \flamg d8 \flamg g4\! g8 | d4.:32(-> d8) g8 g8| d16 g d g d8-> g8 d8 g8 | @@ -79,43 +86,43 @@ snareE = \drummode { snareF = \drummode { g8 | d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8^"Y" d8 g8 | + d8) g d \Y g8 d g | - \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | + \flam d8 g d g8^"Y" d g | + \flam d8 g d \backstick d4 g8 | - d4.:32(-> d8) g8 g8 | - d16 g d g d8-> g8 d8 g8 | + d4.:32(-> d4.:32)(-> | + d8) g d \Y g8 d g | - d16 g d g d8-> db4 g8 | + \flam d8 g d \Y g8 d g | d4.:32( d4.) } %G snareG = \drummode { d8:32( | - d4)-^ \backstick d8 g8 d8 g8-^| - d16 g d g d8 g8 d8 g8 | + d4)-^ \backstick d8 g8 d g| + d16 g d g d8-^ g8 d8 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 g8 g8 \backstick d4 d8:32( | + \flamd d8 g8 d8 \Y d8 g d | + \flamd d8 g8 d8 \backstick d4 d8:32( | d4)-> \backstick d8 g8 d8 g8| d16 g d g d8-> g8 d8 g8 | - \flamd d8 g d8-> \backstick d4 g8 | + \flamd d8 g d \Y d8 g d | d4.:32( d4.) } %H snareH = \drummode { g8 | - \flamd d8 d16 g16 d8 \repeat unfold 3 { \crossstick sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| + \flamd d8 d16 g16 d8 \crossstick { d8 d d }| + \flamd d8 g8 d8 \Y g8 d8 g8| \flamd d8 g8 d8 \backstick d4 g8 | \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| + \flamd d8 d16 g16 d8 \crossstick { d8 d d }| + \flamd d8 g8 d8 \Y g8 d8 g8| \flam d8 g8 d8 \backstick d4 g8 | d4.:32( d4.) diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly index ba49496..c73ad3c 100644 --- a/strathspeys/molly_connell/drums.ly +++ b/strathspeys/molly_connell/drums.ly @@ -2,8 +2,6 @@ \include "lilydrum.ly" -\include "lilydrum.ly" - \include "./config.ily" \include "./notes.bass.ily" \include "./notes.tenor.ily" @@ -12,56 +10,72 @@ \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - \global - << - { - \line \break + \sideglobal + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + << + \new NullVoice = "format" { + \mark \markup { \normalsize {Intro } } + \emptyline + \bar "|." + + \mark \markup { \normalsize {Tune } } + \line \break \line \break \bar "|." - - \part \line \break + \part \line \break + \line \break \bar "|." - }%End of Format - { - \snareA - s8 - \snareA - s8 - + }%Format + + \new DrumVoice = "side" { + \intro + \snareA s8 + \snareA s8 + \snareBA \snareBB - } + + }%Pipes >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - \bassAA - \bassAB - - s8 - \bassAA - s8 - \bassAB - } + } \new PipeBandDrumStaff = "tenor" { + \tenorglobal \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - + + \emptyline + \tenorA \tenorA - - s8 - \tenorBA - s8 + + s8 \tenorBA \tenorBB } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \emptyline + + \bassAA + \bassAB + + s8 \bassAA + \bassAB + } >> + \layout { + \context { + \PipeBandDrumStaff + \RemoveEmptyStaves + \override VerticalAxisGroup.remove-first = ##t + } + } \header { title = \title meter = \meter diff --git a/strathspeys/molly_connell/full.ly b/strathspeys/molly_connell/full.ly index fd62033..b765ac3 100644 --- a/strathspeys/molly_connell/full.ly +++ b/strathspeys/molly_connell/full.ly @@ -3,9 +3,6 @@ \include "bagpipe.ly" \include "lilydrum.ly" -\include "bagpipe.ly" -\include "lilydrum.ly" - \include "./config.ily" \include "./notes.bass.ily" \include "./notes.tenor.ily" @@ -15,102 +12,106 @@ %\include "./notes.lyrics.ily" \score { << - \new PipeBandDrumStaff = "intro" { + \new PipeBandDrumStaff = "intro" { + \global \sideglobal \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \intro } - \new StaffGroup << - \new Staff { - \global - \pipeglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } - << - \new NullVoice = "format" { - \emptyline - \line \break - \line \break - \bar "|." - - \part \line \break - \line \break - \bar "|." - }%Format - - \new Voice = "pipes" { - \emptyline - - \pipesA \pipesA - - s8 \pipesBA - \pipesBB - - }%Pipes - >> - } -% \new Staff = "song" { -% \lyricsglobal -% \new Voice = "lyrics" { -% + \new StaffGroup << + \new Staff { + \global + \pipeglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + << + \new NullVoice = "format" { + \mark \markup { \normalsize {Intro } } + \emptyline + \bar "|." + + \mark \markup { \normalsize {Tune } } + \line \break + \line \break + \bar "|." + + \part \line \break + \line \break + \bar "|." + }%Format + + \new Voice = "pipes" { + \emptyline + + \pipesA \pipesA + + s8 \pipesBA + \pipesBB + + }%Pipes + >> + } +% \new Staff = "song" { +% \lyricsglobal +% \new Voice = "lyrics" { +% +% } % } -% } -% \new Lyrics = "verse1" { -% \lyricsglobal -% \lyricsto "lyrics" { -% \verseA -% } -% } -% \new Staff = "seconds" { -% \pipessecndglobal -% \set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd } -% \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd} -% -% -% } - \new PipeBandDrumStaff = "side" { - \sideglobal - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \emptyline - \snareA s8 - \snareA s8 - - \snareBA - \snareBB - } - \new PipeBandDrumStaff = "tenor" { - \tenorglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \emptyline - - \tenorA - \tenorA - - s8 \tenorBA - \tenorBB - } - \new PipeBandDrumStaff = "bass" { - \bassglobal - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \emptyline - - \bassAA - \bassAB - - s8 \bassAA - \bassAB - } - >> - >> - \layout { +% \new Lyrics = "verse1" { +% \lyricsglobal +% \lyricsto "lyrics" { +% \verseA +% } +% } +% \new Staff = "seconds" { +% \pipessecndglobal +% \set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd } +% \set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd} +% +% +% } + \new PipeBandDrumStaff = "side" { + \sideglobal + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \emptyline + \snareA s8 + \snareA s8 + + \snareBA + \snareBB + } + \new PipeBandDrumStaff = "tenor" { + \tenorglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \emptyline + + \tenorA + \tenorA + + s8 \tenorBA + \tenorBB + } + \new PipeBandDrumStaff = "bass" { + \bassglobal + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \emptyline + + \bassAA + \bassAB + + s8 \bassAA + \bassAB + } + >> + >> \layout { \context { \PipeBandDrumStaff \RemoveEmptyStaves diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly index be6fccc..8c876a5 100644 --- a/strathspeys/molly_connell/side.ly +++ b/strathspeys/molly_connell/side.ly @@ -13,15 +13,20 @@ << { \mark \markup { \normalsize {Intro } } - \line + \line \bar ".|:-|." \break \mark \markup { \normalsize {Tune } } - \repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." + \repeat volta 2 { \line } + \break + \part \line \bar "||" + \break + \part \line \bar "|." } { \intro \snareA s8 - \snareBA \snareBB + \snareBA s8 + \snareBB } >> }