1
0
Fork 0
mirror of https://github.com/kastdeur/pipeband-music.git synced 2025-05-15 20:39:20 +02:00

Updated/Fixed 2/4 Marches and 3/4 Marches (+ template)

This commit is contained in:
Eric Teunis de Boone 2019-01-21 02:07:22 +01:00
parent a63a7cdc6c
commit 27b5a9f0c8
52 changed files with 648 additions and 433 deletions

View file

@ -7,6 +7,18 @@
\include "./notes.tenor.ily"
\include "./notes.side.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\layout {
indent = 5.0
short-indent = 2.0
}
\score {
\new StaffGroup <<
\new PipeBandDrumStaff = "side" {
@ -17,9 +29,10 @@
<<
\new NullVoice = "format" {
\repeat volta 2 { \part \halfline \break \halfline } \break
\part \halfline \break \halfline \bar "||" \break
\line \bar "|."
\repeat volta 2 {
\part \line \markTextEol "Fine"
}\break
\part \line \markTextEol "D.C. al Fine" \bar "||"
}%End of Format
\new DrumVoice = "side" {
\snareA s8

View file

@ -9,35 +9,43 @@
\include "./notes.side.ily"
\include "./notes.pipes.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\layout {
indent = 5.0
short-indent = 2.0
}
\score {
\new StaffGroup <<
\new Staff {
\global
\bagpipeKey
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
\set Staff.instrumentName = \markup{ \instrumentPipes }
\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
<<
{
\repeat volta 2 {
\part \line
\part \line \markTextEol "Fine"
}\break
\part \line \bar "||" \break
\line \bar "|."
\part \line \markTextEol "D.C. al Fine" \bar "||"
}%Format
{
\pipesA s8
\pipesB
\pipesCA s8
}%Pipes
>>
}
\new PipeBandDrumStaff = "side" {
\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
\set PipeBandDrumStaff.instrumentName = \markup \column { \instrumentSide }
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
\sideglobal
\snareA s8
\snareBA
\snareBB
}
\new PipeBandDrumStaff = "tenor" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
@ -48,7 +56,6 @@
r8 \tenorA s8
\tenorB
\tenorA s8
}
\new PipeBandDrumStaff = "bass" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
@ -56,7 +63,6 @@
r8 \bassA s8
\bassB
\bassA s8
}
>>
\header {

View file

@ -6,172 +6,61 @@
\include "./notes.bass.ily"
\include "./notes.tenor.ily"
\layout {
indent = 5.0
short-indent = 2.0
}
\score {
\new StaffGroup <<
<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
\new PipeBandDrumStaff = "side" {
\global
\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
\line \break
\bar "|."
}%Format
\new DrumVoice = "side" {
\intro
\snareA s8
\snareA s8
\snareBA
\snareBB
}%Pipes
||||||| merged common ancestors
\new PipeBandDrumStaff = "side" {
\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
\new PipeBandDrumStaff = "tenor" \with {
instrumentName = \markup{ \instrumentTenor }
shortInstrumentName = \markup{ \shortInstrumentTenor }
} {
\tenorglobal
\global
<<
{
\line \break
\line \break
\bar "|."
\repeat volta 2 {
\part \line
}
\break
\part \line \break
\part \line \break
\bar "|."
}%End of Format
{
\snareA
s8
\snareA
s8
\snareBA
\snareBB
}
=======
\new PipeBandDrumStaff = "tenor" {
\global
\tenorglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
<<
\new NullVoice = "format" {
\repeat volta 2 { \part \halfline \break \halfline } \break
\part \halfline \break \halfline \bar "||" \break
\part \line \bar "||"
\break
\line \bar "|."
}%End of Format
\new DrumVoice = "side" {
}%Format
{
r8 \tenorA s8
\tenorB
\tenorA s8
}%End of side
>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
}%Music
>>
<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
||||||| merged common ancestors
}
\new PipeBandDrumStaff = "bass" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
=======
}
\new PipeBandDrumStaff = "bass" {
\new PipeBandDrumStaff = "bass" \with {
instrumentName = \markup{ \instrumentBass }
shortInstrumentName = \markup{ \shortInstrumentBass }
} {
\bassglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
}
\new PipeBandDrumStaff = "tenor" {
\tenorglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
\emptyline
\tenorA
\tenorA
s8 \tenorBA
\tenorBB
||||||| merged common ancestors
\bassAA
\bassAB
s8
\bassAA
s8
\bassAB
}
\new PipeBandDrumStaff = "tenor" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
\tenorA
\tenorA
s8
\tenorBA
s8
\tenorBB
=======
r8 \bassA s8
\bassB
\bassA s8
>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
}
\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
composer = \markup {
\column \right-align {
$(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} )
$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
$(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} )
}

View file

@ -6,7 +6,7 @@ pipeglobal = {
\bagpipeKey
}
pipesA = {
\grg a16. [ b32 ] |
\tag #'upbeat { \grg a16. [ b32 ] | }
\thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]|
\thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]|
\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
@ -15,28 +15,17 @@ pipesA = {
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] |
\thrwd d8 [ \grg f8 ] \thrwd d8
\thrwd d8 [ \grg f8 ] \thrwd d8
}
pipesB = {
e8 |
\grg a16. [ \grd a32 a16 \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
\grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] |
\grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] |
\grg d32 [ f16. \grg d32 f16. ] e16. [ g32 \grA f32 g16. ] |
A8 [ \grip A8 ] \grg A16. [ g32 f16. e32 ]
}
pipesCA = {
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
\grg c32 [ d16. \grg b32 \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16. f32 ] |
\dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] |
\thrwd d8 [ \grg f8 ] \thrwd d8
}
A8 [ \grip A8 ] \grg A16. [ g32 f16. e32 ]
}

View file

@ -7,7 +7,7 @@ sideglobal = { \eighthBeaming }
snareA = \drummode {
\tutti {
d16. g32 |
\tag #'upbeat { d16. g32 | }
d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 |
d8:32(-> g:32)(-> \triplet { d16) g d-> } g16. g32 |
\flam d8 d8:32( g8)
@ -22,6 +22,9 @@ snareA = \drummode {
} g32 |
\flam d16. g32-> d32 g d g d8
}
snareBB = \drummode {
\removeWithTag #'upbeat \snareA
}
snareBA = \drummode {
g8 |

View file

@ -5,6 +5,12 @@
\include "./config.ily"
\include "./notes.pipes.ily"
markTextEol = #(define-music-function (parser location text) (string?) #{
\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
\mark \markup $text
#})
\score {
\new Staff {
\global
@ -12,16 +18,13 @@
<<
{
\repeat volta 2 {
\part \line
}\break
\part \line \bar "||" \break
\line \bar "|."
\part \line \markTextEol "Fine"
}\break
\part \line \markTextEol "D.C. al Fine" \bar "||"
}
{
\pipesA s8
\pipesB
\pipesCA
}
>>
}
@ -40,7 +43,7 @@
\pipesA
\pipesA
\pipesB
\pipesCA
\removeWithTag #'upbeat \pipesA
}
\midi { \confTempo }
\header {

View file

@ -37,28 +37,3 @@
composer = \composerTenor
}
}
midiTenor = midiDrumPitches
midiTenor.right-hand = \tenorDefault
midiTenor.left-hand = \tenorDefault
\score {
\new PipeBandDrumStaff
\with {
drumPitchTable = #(alist->hash-table midiTenor)
}
{ \global \tenorglobal
%%Tune
\tenorA
r8 \tenorA
\tenorB
\tenorA r8
}
\midi { \confTempo }
\header {
title = \title
meter = \meter
instrument = \instrumentPipes
composer = \composerPipes
}
}