kastdeur/pipeband-music
1
0
Fork 0
mirror of https://github.com/kastdeur/pipeband-music.git synced 2025-05-15 12:29:22 +02:00
Code Issues Releases Activity

Removed a few double includes for "bagpipe.ly" and "lilydrum"

Browse source 
This needs to be done for every file

New Scores for Tenor mostly (not fully integrated yet)

Some bugfixes in layout
This commit is contained in:
Eric Teunis de Boone 2016-12-21 01:41:50 +01:00
parent 0220f74640
commit aef0f5b65a
61 changed files with 1350 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
2-4_marches/black_bear/.tenor.ly.swp Normal file
View file

Binary file not shown.

8
2-4_marches/black_bear/drums.ly
View file

@ -33,10 +33,10 @@
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
\tenorA s8
r8 \tenorA s8
\tenorBA
\tenorBB
\tenorB
\tenorA s8
}
\new PipeBandDrumStaff = "bass" {
\bassglobal
@ -45,7 +45,7 @@
r8 \bassA s8
\bassB
\bassA
\bassA s8
}
>>

9
2-4_marches/black_bear/full.ly
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"
@ -48,10 +45,10 @@
\tenorglobal
\tenorA s8
r8 \tenorA s8
\tenorBA
\tenorBB s8
\tenorB
\tenorA s8
}
\new PipeBandDrumStaff = "bass" {
\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }

180
2-4_marches/black_bear/mid.ly Normal file
View file

@ -0,0 +1,180 @@
\version "2.19.0"
\include "lilydrum.ly"
\include "./config.ily"
\include "./notes.bass.ily"
\include "./notes.tenor.ily"
\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}
\global
<<
{
\line \break
\line \break
\bar "|."
\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
\line \bar "|."
}%End of Format
\new DrumVoice = "side" {
r8 \tenorA s8
\tenorB
\tenorA s8
}%End of side
>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
>>
<<<<<<< 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" {
\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 }}#} )
}
}
}
}

40
2-4_marches/black_bear/notes.bass.ily
View file

@ -1,50 +1,38 @@
% 2/4 Black Bear>
% Bass
\version "2.18.2"
composerBass = "E.T. de Boone, 2016"
composerBass = "E.T. de Boone, v0.9, 2016"
bassglobal = {}
% Music
bassA = \drummode {
d8 g
d4
|
d8 g8
d4
|
\repeat unfold 2 {
d4-- g4-^ |
}
d8 d8
g4
|
r4
g8 d8
d4\v
d8\p\< g8
|
d8 g
d4
\repeat unfold 2 {
d4--\! g4-^ |
}
|
d8 g
d4
|
d8. g16
d8 g8
|
d8 g8
r8 g
d8
}
bassB = \drummode {
g8
|
d4
g4
|
d4
r4
|
d4
g4
|
d4
r4
\repeat unfold 2 {
d4\< g4 |
d4\! r4 |
}
|
d4

3
2-4_marches/black_bear/notes.pipes.ily
View file

@ -2,6 +2,9 @@
% Pipes
\version "2.18.2"
composerPipes = "1936"
pipeglobal = {
\bagpipeKey
}
pipesA = {
\grg a16. [ b32 ] |
\thrwd d8 [ \dbld d8 ] \grg f16.[ d32 A16. f32 ]|

72
2-4_marches/black_bear/notes.tenor.ily
View file

@ -1,67 +1,39 @@
% 2/4 Black Bear
% Tenor
\version "2.18.2"
composerTenor = "E.T. de Boone, v0.6, 2016"
composerTenor = "E.T. de Boone, v0.9, 2016"
tenorglobal = {}
% Music
tenorApiece = \drummode {
d8 g8
\triplet { d16 g d } g8
tenorA = \drummode {
d8 g8 d4
|
d8 g8
\triplet { d16 g d } g8
d8 g8 d4
|
d8 d8
g4
d8 \triplet { d16 g d} g4
|
d4^\splitTheFeather
r8 \triplet { g16 d g }
d4^\parenthesize \splitTheFeather r4
|
d8 g8
\triplet { d16 g d } g8
d8 g8 d4
|
d8 g8 d4
|
d8 d16. g32 d16 g8-> g16
|
d8 g8
\triplet { d16 g d } g8
|
d8 g16. g32
d16. g8 d32
|
d8 d8
g8
}
tenorA = \drummode {
g8 |
\tenorApiece
d8
}
tenorBA = \drummode {
tenorB = \drummode {
g8 |
d16. g32 d16. d32
g4
|
r4
d32 g16. g32 d16.
|
d16. g32 d16. d32
g4
|
r4
d32 g16. g32 d16.
|
\repeat unfold 2 {
d8 g8 d8 g8|
r16 g8 g16 \triplet { d16 g d } g8 |
}
d32 g16. g32 d16.
d32 g16. g32 d16.
|
g32 d16. g32 d16.
g32 d16. g32 d16.
|
d16. g32 d16. d32
g16. d32 g16. g32
|
d4
d16. g32 g16. d32
}
tenorBB = \drummode {
\tenorApiece
d4 g8. g16 |
d8 g d4 |
d8 d g g |
d4^\parenthesize \splitTheFeather r4
}

20
2-4_marches/black_bear/pipes.ly
View file

@ -10,7 +10,7 @@
\score {
\new Staff {
\global
\bagpipeKey
\pipeglobal
<<
{
\repeat volta 2 {
@ -34,3 +34,21 @@
composer = \composerPipes
}
}
\score {
\new Staff { \global \pipeglobal
\set Staff.midiInstrument = #"bagpipe"
%%Tune
\partial 8
\pipesA
\pipesA
\pipesB
\pipesCA
}
\midi { \confTempo }
\header {
title = \title
meter = \meter
instrument = \instrumentPipes
composer = \composerPipes
}
}

31
2-4_marches/black_bear/tenor.ly
View file

@ -22,10 +22,10 @@
}%Format
{
\tenorA s8
r8 \tenorA s8
\tenorBA
\tenorBB
\tenorB
\tenorA s8
}
>>
@ -37,3 +37,28 @@
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
}
}