1
0
Fork 0
mirror of https://github.com/kastdeur/pipeband-music.git synced 2024-12-23 00:33:31 +01:00

Merge remote-tracking branch 'origin/master' into HEAD

This commit is contained in:
Eric Teunis de Boone 2016-03-11 23:59:00 +01:00
commit 34b98e30cb
20 changed files with 61 additions and 30 deletions

View file

@ -31,7 +31,7 @@
\new PipeBandDrumStaff = "side" { \new PipeBandDrumStaff = "side" {
\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
\sideglobal
\snareA s8 \snareA s8
\snareBA \snareBA
\snareBB \snareBB

View file

@ -6,6 +6,7 @@
\score { \score {
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
\sideglobal
<< <<
{ {
\repeat volta 2 { \part \halfline \break \halfline } \break \repeat volta 2 { \part \halfline \break \halfline } \break

View file

@ -9,7 +9,7 @@
\repeat volta 2 { \bassA } \break \repeat volta 2 { \bassA } \break
\bassBA \break \bassBA \break
\bassBB \bassBB \bar "|."
} }
\header { \header {
title = \title title = \title

View file

@ -3,7 +3,7 @@
\include "config.ily" \include "config.ily"
\include "notes.bass.ily" \include "notes.bass.ily"
%\include "notes.tenor.ily" %\include "notes.tenor.ily"
\include "notes.side.ily" \include "notes.side.alt.ily"
\include "notes.pipes.ily" \include "notes.pipes.ily"
\score { \score {
@ -37,8 +37,8 @@
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
\snareA s8 \snareA s8
\snareB \snareBA
\snareB \snareBB
} }
\new PipeBandDrumStaff = "bass" { \new PipeBandDrumStaff = "bass" {

View file

@ -1,7 +1,7 @@
% 2/4 MacKenzie Highlanders % 2/4 MacKenzie Highlanders
% Bass % Bass
\version "2.18.2" \version "2.18.2"
composerBass = "C. Ooms, 2015" composerBass = "C. Ooms, 2016"
bassglobal = {} bassglobal = {}
bassA = \drummode { bassA = \drummode {

View file

@ -7,14 +7,20 @@
\new PipeBandDrumStaff { \new PipeBandDrumStaff {
\global \global
<< <<
{\repeat volta 2 { \part \line \break \line} \break {
\repeat volta 2 {
\part \line
\break
\line
}
\break
\part \line \break \part \line \break
\line \break \line \break
\line \bar "|." \line \bar "|."
} }
{ {
\tenorAA \tenorAA
\tenorAB \tenorAB s8
\tenorBA \tenorBA
\tenorBB \tenorBB

View file

@ -1,7 +1,7 @@
% 2/2 The MacKenzie's Reel % 2/2 The MacKenzie's Reel
% Side % Side
\version "2.18.2" \version "2.18.2"
composerSide = "C. Ooms, 2015" composerSide = "C. Ooms, 2016"
sideglobal = { \eighthBeaming} sideglobal = { \eighthBeaming}
snareA = \drummode { snareA = \drummode {

View file

@ -8,11 +8,13 @@
\global \global
\sideglobal \sideglobal
<< <<
{ \repeat volta 2 { \line } \break {
\repeat volta 2 {\line } \break
\repeat volta 2 { \line } \repeat volta 2 { \line }
} }
{ {
\snareA \snareA
\snareBB \snareBB
} }
>> >>

View file

@ -3,7 +3,7 @@
global = { global = {
\time 4/4 \time 4/4
} }
confTempo = { \tempo 4 = 108 }
%% Format %% Format
part = { \partial 16 s16 } part = { \partial 16 s16 }
line = { \repeat unfold 4 { s1 | } } line = { \repeat unfold 4 { s1 | } }

View file

@ -1,7 +1,7 @@
% 4/4 Lady MacKenzie of Fairburn % 4/4 Lady MacKenzie of Fairburn
% Side % Side
\version "2.18.2" \version "2.18.2"
composerSide = "E.T. de Boone, v0.9, 2015" composerSide = "E.T. de Boone, v0.9, 2016"
snareA = \drummode { snareA = \drummode {
\flam d8. g16 \flam d8. g16
d8.:32( g16) d8.:32( g16)
@ -13,7 +13,7 @@ snareA = \drummode {
d8.:32(-> \dr g16:64)(-> d8.:32(-> \dr g16:64)(->
d4) d4)
| |
\triplet { d8 d g } \triplet { \drag d8 d g }
\flam d8. \fr g16 -> \flam d8. \fr g16 ->
\triplet { d16\< g d g d8 } \triplet { d16\< g d g d8 }
g16\! d8. g16\! d8.
@ -27,8 +27,8 @@ snareBA = \drummode{
g16 | g16 |
\triplet {d8 g \flam d } \triplet {d8 g \flam d }
\triplet {g d \flam g } \triplet {g d \flam g }
\triplet {d8 g \flam d \dr } \triplet {d8 g \flam d }
\flam g8. g16 \flam g8. \dr g16
| |
\flam d16. d32 \flam g8 \fr \flam d16. d32 \flam g8 \fr
d8.:32( g16:32)(-> d8.:32( g16:32)(->

View file

@ -1,22 +1,22 @@
% 4/4 Lady MacKenzie of Fairburn % 4/4 Lady MacKenzie of Fairburn
% Tenor % Tenor
\version "2.18.2" \version "2.18.2"
composerTenor = "E.T. de Boone, v0.8, 2015" composerTenor = "E.T. de Boone, v0.9, 2016"
tenorA = \drummode { tenorA = \drummode {
d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >>
| |
\flourish { d4 g4 d4 g4 } \flourish { d4 g4 d4 g4 }
| |
d4 r16 g d-> r r8. g16 d4 d4 \triplet { d8 \< g d-> \> } \triplet { g8 d g } d4 \!
| |
d4 g4 d4 r4 d4 g4 d4 r4
| |
} }
tenorBA = \drummode { tenorBA = \drummode {
\triplet { d8 \< g d } \triplet { d8 \pppp \< g d }
\triplet { g8 d g } \triplet { g8 d g }
\triplet { d8 g d } \triplet { d8 g d }
g8. \! g16 g8. \! \mf g16
| |
d8. g16-> d8. g16->
r8. g16 r8. g16
@ -34,10 +34,10 @@ tenorBA = \drummode {
d4 d4
} }
tenorBB = \drummode { tenorBB = \drummode {
\triplet { d8 \< g d } \triplet { d8 \pppp \< g d }
\triplet { g8 d g } \triplet { g8 d g }
\triplet { d8 g d } \triplet { d8 g d }
g8. \! g16 g8. \! \mf g16
| |
d8.^"begin scoop" \dr g16-> d8.^"begin scoop" \dr g16->
r8. g16 r8. g16

View file

@ -19,3 +19,22 @@
composer = \composerPipes composer = \composerPipes
} }
} }
\score {
\midi { \confTempo }
\new Staff {
\global
\bagpipeKey
\partial 16
\pipesA
\pipesA
\pipesBA
\pipesBB
}
\header {
title = \title
meter = \meter
instrument = \instrumentPipes
composer = \composerPipes
}
}

View file

@ -8,7 +8,7 @@
\global \global
\bassglobal \bassglobal
<< <<
{ } { }%Format
{ } { }
>> >>
} }

View file

@ -3,5 +3,6 @@
\version "2.18.2" \version "2.18.2"
composerBass = "" composerBass = ""
bassglobal = {} bassglobal = {}
% Music
bassA = \drummode { bassA = \drummode {
} }

View file

@ -5,5 +5,6 @@ composerPipes = ""
pipeglobal = { pipeglobal = {
\bagpipeKey \bagpipeKey
} }
% Music
pipesA = { pipesA = {
} }

View file

@ -3,5 +3,6 @@
\version "2.18.2" \version "2.18.2"
composerSide = "" composerSide = ""
sideglobal = {} sideglobal = {}
% Music
\snareA = \drummode { \snareA = \drummode {
} }

View file

@ -3,5 +3,6 @@
\version "2.18.2" \version "2.18.2"
composerTenor = "" composerTenor = ""
tenorglobal = {} tenorglobal = {}
% Music
tenorA = \drummode { tenorA = \drummode {
} }

View file

@ -7,9 +7,8 @@
\new Staff { \new Staff {
\global \global
\pipeglobal \pipeglobal
\pipeKey
<< <<
{ } { }%Format
{ } { }
>> >>
} }

View file

@ -8,7 +8,7 @@
\global \global
\sideglobal \sideglobal
<< <<
{ } { }%Format
{ } { }
>> >>
} }

View file

@ -8,7 +8,7 @@
\global \global
\tenorglobal \tenorglobal
<< <<
{} {}%Format
{} {}
>> >>
} }