Fixed a few scores from previous fix

This commit is contained in:
Eric Teunis de Boone 2016-12-12 12:18:34 +01:00
parent c222ebaea3
commit 17615a7236
34 changed files with 475 additions and 245 deletions

View File

@ -0,0 +1,28 @@
\version "2.18.2"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.bass.ily"
\score {
\new PipeBandDrumStaff {
\global
\bassglobal
<<
\new NullVoice = "format"
{
}%Format
\new DrumVoice {
}
>>
}
\header {
title = \title
meter = \meter
instrument = \instrumentBass
composer = \composerBass
}
}

View File

@ -1,5 +1,8 @@
\version "2.19.0"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.bass.ily"
\include "./notes.tenor.alt.ily"
@ -10,7 +13,7 @@
\new StaffGroup <<
\new Staff {
\global
\bagpipeKey
\pipeglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
<<

View File

@ -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"
@ -16,7 +13,7 @@
\new StaffGroup <<
\new Staff {
\global
\bagpipeKey
\pipeglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
<<

View File

@ -0,0 +1,166 @@
\version "2.19.0"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.bass.ily"
\include "./notes.tenor.alt.ily"
\score {
\new StaffGroup <<
\new PipeBandDrumStaff = "bass" {
\global
\bassglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
<<
{
\repeat volta 2 { \line } \break
\line \bar "||" \break
\line \bar "|."
}%Format
{
\bassA
\bassBA
\bassBB
}
>>
}
\new PipeBandDrumStaff = "tenor" {
\tenorglobal
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
\tenorA
\tenorBA
\tenorBB
}
>>
\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 }}#} )
}
}
}
}
\include "./notes.tenor.alt.ily"
\score {
\new PipeBandDrumStaff {
\global
\tenorglobal
<<
{
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}%Format
{
\tenorA s8
\tenorBA
\tenorBB s8
}
>>
}
\header {
title = ""
meter = ""
instrument = ""
composer = \composerTenor
}
}
\include "./notes.tenor.ily"
\score {
\new PipeBandDrumStaff {
\global
\tenorglobal
<<
{
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}%Format
{
\tenorA s8
\tenorBA
\tenorBB s8
}
>>
}
\header {
title = ""
meter = ""
instrument = ""
composer = \composerTenor
}
}
\score {
\new PipeBandDrumStaff {
\global
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}
}
\score {
\new PipeBandDrumStaff {
\global
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}
}
\score {
\new PipeBandDrumStaff {
\global
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}
}
\score {
\new PipeBandDrumStaff {
\global
\repeat volta 2 {
\part \line
}
\break
\part \line \bar "||" \break
\line \bar "|."
}
}

View File

@ -2,7 +2,9 @@
% Pipes
\version "2.18.2"
composerPipes = ""
pipeglobal = { }
pipeglobal = {
\bagpipeKey
}
pipesA = {
\dblA A8 |
\dblc c8 [ \gre b16. \grd c32 ] \grg a16. [ b32 \grg c16. d32 ] |

View File

@ -1,39 +1,40 @@
% 2/4 MacKenzie Highlanders
% Snare
\version "2.18.2"
composerSide = "v1.1, 2016"
composerSide = "v1.2, 2016"
sideglobal = { \eighthBeaming }
%%music
snareA = \drummode {
d8:32( |
g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
\flam d8 d8:32( g8:32) d16. g32 |
d8:32( \dr |
g8)\fr \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
\flam d8 d8:32( g8:32) d16.\dr g32 |
d8:32( g16.) g32-> d32 g d g-> d8-> |
d4:32(\< d8)\! d8:32( |
d8:32( g16.)\fr g32-> d32 g d g-> d8-> |
d4:32(\dr\< d8)\! d8:32( |
g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } |
g8)\fr \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
d8-> g8:32(-> d8:32)(\dr-> \tuplet 3/2 { g16) d g } |
d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] |
d4:32( d8)
d4:32( d8)\fr
}
% Part 2
snareBA = \drummode {
g8 |
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> d8:32( g8) d16. g32 |
d8-> d8:32( g8) d16.\dr g32 |
d8:32( g16.) g32-> d32 g d g-> d8-> |
d4:32(\< d8)\! g8-> |
d8:32( g16.)\fr g32-> d32 g d g-> d8-> |
d4:32(\dr\< d8)\!\fr g8-> |
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } |
d8-> g8:32(-> d8:32)(\dr-> \tuplet 3/2{ g16) d g } |
d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] |
d4:32( d8) g8
d4:32( d8)\fr
}
snareBB = \drummode {
g8 |
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> d8:32( g8) d16. g32 |

View File

@ -0,0 +1,48 @@
% 2/4 MacKenzie Highlanders
% Snare
\version "2.18.2"
composerSide = "v1.1, 2016"
sideglobal = { \eighthBeaming }
%%music
snareA = \drummode {
d8:32( |
g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
\flam d8 d8:32( g8:32) d16. g32 |
d8:32( g16.) g32-> d32 g d g-> d8-> |
d4:32(\< d8)\! d8:32( |
g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 |
d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } |
d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] |
d4:32( d8)
}
% Part 2
snareBA = \drummode {
g8 |
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> d8:32( g8) d16. g32 |
d8:32( g16.) g32-> d32 g d g-> d8-> |
d4:32(\< d8)\! g8-> |
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } |
d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] |
d4:32( d8) g8
}
snareBB = \drummode {
d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> |
d8-> d8:32( g8) d16. g32 |
d8:32( g16.) g32-> d32 g d g-> d8-> |
\flam d4 d8:32(-> \< g8:32)(-> |
d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> }
d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } |
d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] |
d4:32( d4)
}

View File

@ -9,77 +9,35 @@ tenorglobal = {
tenorA = \drummode {
g8 |
d16.\< g32 d16. g32\!
r16. g32\< \triplet { d16 g d }
|
g16.->\< d32 g16. g32 \!
r16. d32\< \triplet { g16 d g }
|
d16. \< g32 d16. d32 \!
r16 g16\< r16 d16
|
r16 g16 r16 d16
g8\! g8
|
d4 d8 g |
d8 \< g8 d4 \! |
d8-> g d g |
d4 g4 |
d16.\< g32 d16. g32 \!
r16. g32\< \triplet { d16 g d }
|
g16.->\< d32 g16. g32 \!
r16. g32\< d16. g32
|
d32 g16.\! d16. g32
r16. g32 d16. g32
|
d8.. g32
r8
d4 d8 g |
d8 \< g d4 \! |
d16-> g16 r8 g16-> g8 g16 |
d4 g4 |
}
tenorA = \drummode {
s8 |
d4 g4 |
d4 d8 g |
d8. g16 d8. g16-> |
r8. g16 d4 |
d4 g4 |
d8 g d4 |
d16-> g16 r8 g16-> d8 g16 |
d4 g4 |
}
tenorBA = \drummode {
g8 |
r8 d32 g16.
r8 d32 g16.
|
d4
r8 g8
|
r8 d32 g16.
r8 d32 g16.
|
r4
d8 g8
|
r8 d32 g16.
r8 d32 g16.
|
d4 r8 g8
|
r8 d32 g16.
r8 d32 g16.
|
r4 r8
s2*4 |
s2*4 |
}
tenorBB = \drummode {
g8 |
r8 d32 g16.
r8 d32 g16.
|
d4
r8 g8
|
r8 d32 g16.
r8 d32 g16.
|
r4
d8 g8
|
\repeat unfold 3
{
r8 d32 g16.
r8 d32 g16.
|
}
d4 r8
s2*4 |
s2*4 |
}

View File

@ -2,8 +2,6 @@
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "./config.ily"
\include "./notes.pipes.ily"

View File

@ -2,14 +2,13 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.side.ily"
\score {
\new PipeBandDrumStaff {
\global
\sideglobal
<<
{
\repeat volta 2 { \part \line } \break
@ -31,29 +30,3 @@
}
\layout {}
}
\score {
\new PipeBandDrumStaff {
\global
\unfoldRepeats {
\repeat volta 2 {
\partial 8 \snareA
}
\bar "|."
\snareBA \bar "||"
\snareBB
}
}
\header {
title = \title
meter = \meter
instrument = \instrumentSide
composer = \composerSide
}
\midi {
\tempo 4 = 80
}
}

View File

@ -2,7 +2,7 @@
% Snare
\version "2.18.2"
composerSide = ""
sideglobal = {}
sideglobal = { \eighthBeaming }
%%music
snareEnds = \drummode {

View File

@ -10,6 +10,7 @@
\score {
\new PipeBandDrumStaff {
\global
\sideglobal
<<
{
\partial 4 s4 |

View File

@ -2,7 +2,7 @@
% Snare
\version "2.18.2"
composerSide = ""
sideglobal = {}
sideglobal = { \eighthBeaming }
%%music
snareEnding = \drummode {

View File

@ -2,8 +2,6 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.side.ily"

View File

@ -2,7 +2,7 @@
% Side
\version "2.18.2"
composerSide = "W.H. de Boone, 2014"
sideglobal = {}
sideglobal = { \eighthBeaming }
snareAA = \drummode {
\flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g |
\flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g |

View File

@ -2,8 +2,6 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.side.ily"

View File

@ -2,7 +2,7 @@
% Side
\version "2.18.2"
composerSide = ""
sideglobal = {}
sideglobal = { \eighthCompoundBeaming }
snareA = \drummode {
g8 |
\flam d8 d:32( g) \flam d8 g16. d32 g16. g32 |

View File

@ -2,7 +2,7 @@
% Side
\version "2.18.2"
composerSide = ""
sideglobal = {}
sideglobal = { \sixteenthCompoundBeaming }
snareA = \drummode {
\flam d4 \flam d8 d16:64( d8) d16:64( d8) |
d4:32( d8) \drag d16 d-> g g \flam d8 |

View File

@ -2,7 +2,7 @@
% Side
\version "2.18.2"
composerSide = ""
sideglobal = {}
sideglobal = { \eighthCompoundBeaming }
snareA = \drummode {
d8:32( |
g8.) d16 g8 \flamd d8. g16 d8 |

View File

@ -7,12 +7,14 @@
\layout {
indent = 0
\set Score.markFormatter = #format-mark-box-alphabet
\context {
\Staff
\numericTimeSignature
% \hideKeySignature
}
}
\score {
\new Staff = "staff_pipes" {
\numericTimeSignature
\hideKeySignature
\compressMMRests {
\tempo 2. = 32
\time 3/4
@ -34,6 +36,7 @@
\time 4/4
R1
}
\bar "||"
\mark \default
@ -75,6 +78,7 @@
\bar "||"
\mark \default
\compressMMRests {
R1*4
}

View File

@ -1,6 +1,6 @@
\version "2.18.2"
#(set-default-paper-size "a4" 'landscape)
%#(set-default-paper-size "a4" 'landscape)
#(set-global-staff-size 19)
\layout {
indent = 0

View File

@ -1,5 +1,7 @@
\version "2.18.2"
\include "bagpipe.ly"
\include "./config.ily"
%\include "./notes.pipes.ily"
\include "./notes.lyrics.ily"

View File

@ -2,18 +2,8 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "config.ily"
\include "notes.bass.ily"
\include "./config.ily"
\include "./notes.bass.ily"
\score {
\new PipeBandDrumStaff {
@ -22,10 +12,12 @@
<<
\new NullVoice = "format"
{
\part
\line
\bar "|."
}%Format
\new DrumVoice {
\bassA s4
}
>>
}

View File

@ -0,0 +1,17 @@
\version "2.19.0"
%% Globals
global = {
\time 2/2
}
confTempo = {
\tempo 2 = 80
}
%% Format
part = { \partial 4 s4 }
measure = { \grace {s1} s1 | }
halfline = { \repeat unfold 4 \measure }
line = { \repeat unfold 2 { \halfline } }
%% Headers
title = "De Jonge Prins van Friesland"
meter = "Mars"

View File

@ -2,20 +2,10 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "config.ily"
\include "notes.bass.ily"
\include "notes.tenor.ily"
\include "notes.side.ily"
\include "./config.ily"
\include "./notes.bass.ily"
\include "./notes.tenor.ily"
\include "./notes.side.ily"
\score {
\new StaffGroup <<

View File

@ -3,28 +3,13 @@
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\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"
\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"
\score {
\new StaffGroup <<

View File

@ -0,0 +1,27 @@
% 2/2 De Jonge Prins van Friesland
% Bass
\version "2.18.2"
composerBass = ""
bassglobal = {}
% Music
bassA = \drummode {
r4 |
d4 g d g |
d4 r g r |
d4 g d g |
d4. g8 d4
r4|
d4 g d g |
d4 r g r |
d4 g d g |
d2.
}
simpleBassA = \drummode {
r4 |
\repeat percent 4 {
d2 g2 |
d2 r2
}
}

View File

@ -0,0 +1,10 @@
% <<TimeSig>> <<Title>>
% Pipes
\version "2.18.2"
composerPipes = ""
pipeglobal = {
\bagpipeKey
}
% Music
pipesA = {
}

View File

@ -0,0 +1,33 @@
% 2/2 De Jonge Prins van Friesland
% Side
\version "2.18.2"
composerSide = ""
sideglobal = {}
% Music
snareA = \drummode {
g4 |
\flam d4 g \flam d g |
d8 g d g \flam d4 d8 g |
\flam d4 g d g |
d2:32( d4)
g4 |
\flam d4 g \flam d g |
d8 g d g \flam d4 d8 g |
\flam d4 g d g |
d2.:32\fermata
}
snareOrigA = \drummode {
r4 |
sn4 4 4 4 |
sn2:32( 4) 4 |
sn4 r4 sn4 r4 |
sn4 4 4
sn4 |
sn4 4 4 4 |
sn2:32( 4) 4 |
sn4 r4 sn4 r4
sn2.:32\fermata
}

View File

@ -0,0 +1,19 @@
% 2/2 De Jonge Prins van Friesland
% Tenor
\version "2.18.2"
composerTenor = ""
tenorglobal = {}
% Music
tenorA = \drummode {
g4 |
d4\up g\up d\up g\up |
d8 g d g d4 r4 |
\flourish d2 \flourish g2 |
r2\blfy r4
g4 |
d4\up g\up d\up g\up |
d8 g d g d4 r4 |
\flourish d2 \flourish g2 |
d2.^\splitTheFeather
}

View File

@ -2,18 +2,8 @@
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "config.ily"
\include "notes.pipes.ily"
\include "./config.ily"
\include "./notes.pipes.ily"
\score {
\new Staff {

View File

@ -2,37 +2,44 @@
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "config.ily"
\include "notes.side.ily"
\include "./config.ily"
\include "./notes.side.ily"
\score {
\new PipeBandDrumStaff {
\global
\sideglobal
<<
\new NullVoice = "format" {
}%Format
\new DrumVoice = "side" {
}
>>
}
\new StaffGroup <<
\new PipeBandDrumStaff = "side" {
\global
\sideglobal
\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
<<
\new NullVoice = "format" {
\part
\line
\bar "|."
}%End of Format
\new DrumVoice = "side" {
\snareA s4
}%End of side
>>
}
\new PipeBandDrumStaff = "trom" {
\global
\sideglobal
\set PipeBandDrumStaff.instrumentName = \markup{Trom}
\set PipeBandDrumStaff.shortInstrumentName = \markup{T.}
\new DrumVoice = "trom" {
\snareOrigA s4
}%End of side
}
>>
\header {
title = \title
meter = \meter
instrument = \instrumentSide
composer = \composerSide
arranger = \arrangerSide
}
}

View File

@ -1,28 +1,9 @@
\version "2.18.2"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "bagpipe.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "lilydrum.ly"
\include "config.ily"
\include "notes.tenor.ily"
\include "./config.ily"
\include "./notes.tenor.ily"
\score {
\new PipeBandDrumStaff {
@ -30,11 +11,14 @@
\tenorglobal
<<
\new NullVoice = "format" {
\part
\line
\bar "|."
}%Format
\new DrumVoice = "tenor" {
\tenorA s4
}
>>
}

View File

@ -2,8 +2,6 @@
\include "bagpipe.ly"
\include "bagpipe.ly"
\include "./config.ily"
\include "./notes.pipes.seconds.ily"
@ -41,13 +39,14 @@
title = \title
meter = \meter
instrument = \instrumentSecnd
composer = \composerPipesSecnd
composer = \composerPipessecnd
}
}
\score {
\new Staff { \global \pipessecndglobal
\set Staff.midiInstrument = #"bagpipe"
%%Tune
\partial 4
\pipessecndAA
\pipessecndAB
@ -58,7 +57,7 @@
title = \title
meter = \meter
instrument = \instrumentSecnd
composer = \composerPipesSecnd
composer = \composerPipessecnd
}
}