Fixes and additions.

This commit is contained in:
Sven Axelsson 2009-01-28 17:53:50 +01:00
parent 10aaa27a6d
commit 2a36df9cba
5 changed files with 57 additions and 180 deletions

13
_sets/christmas.ly Normal file
View File

@ -0,0 +1,13 @@

\header {
title = "Christmas Carols"
}
\include "others/come_all_ye_faithful.ly"
\include "others/good_king_wenceslas.ly"
\include "others/jingle_bells.ly"
\paper {
between-system-space = 15\mm
}

View File

@ -1,13 +1,13 @@
%{
Bagpipe music settings for Lilypond.
This file builds on work by Andrew McNabb (http://www.mcnabbs.org/andrew/)
Substantial changes and additions made by
Substantial changes and additions made by
Sven Axelsson, the Murray Pipes & Drums of Gothenburg
(http://www.murrays.nu)
%}
\version "2.11.0"
\version "2.12.0"
% Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
% Flat notes used mainly in some modern music.
@ -44,7 +44,7 @@ showKeySignature = {
\override Staff.KeySignature #'stencil = #'ly:key-signature-interface::print
}
% Show the true key signature (E-flat major). Use together with
% Show the true key signature (E-flat major). Use together with
% \transpose f a to print scores for other instruments.
showTrueKeySignature = {
\override Staff.KeySignature #'stencil = #'ly:key-signature-interface::print
@ -56,35 +56,35 @@ showTrueKeySignature = {
% Various tweaks to get good defaults for bagpipe music.
\layout {
indent = 0.0
\context {
\Score
\remove "Bar_number_engraver"
\override Stem #'direction = #down
\override Slur #'direction = #up
\override Tie #'direction = #up
\override KeySignature #'print-function = ##f
\override VoltaBracketSpanner #'Y-extent = #'(-1 . 0)
\override VoltaBracket #'height = #2.2
}
\context {
\StaffGroup
extraNatural = ##f
\override KeySignature #'stencil = ##f
}
\context {
\Staff
extraNatural = ##f
midiInstrument = #"bagpipe"
\override KeySignature #'stencil = ##f
}
}
@ -288,43 +288,43 @@ crunamcfosg = { \grace { \small e32[ c f c ] } }
crunamdfosg = { \grace { \small e32[ d f d ] } }
% Special piobaireachd notations
grGcad = { \grace { \small G16 } }
gracad = { \grace { \small a16 } }
cad = { \grace { \small g32[ e8 d32] } }
hcad = { \grace { \small g32[ e8] } }
grGcad = { \grace { \small G16 } }
gracad = { \grace { \small a16 } }
cad = { \grace { \small g32[ e8 d32] } }
hcad = { \grace { \small g32[ e8] } }
tcad = { \grace { \small e8[ d32] } }
thcad = { \grace { \small e8 } }
% This is the same as thrwe
dre = { \grace { \small e32[ a f a] } }
dre = { \grace { \small e32[ a f a] } }
% This is the same as thrwf
dare = { \grace { \small f32[ e g e] } }
bari = { \grace { \small e32[ G f G] } }
dari = { \grace { \small f32[ e g e f e] } }
pthrwd = { \grace { \small G32[ d32 c] } }
darodo = { \grace { \small G32[ d G c G] } }
Gdarodo = { \grace { \small d32[ G c G] } }
dare = { \grace { \small f32[ e g e] } }
bari = { \grace { \small e32[ G f G] } }
dari = { \grace { \small f32[ e g e f e] } }
pthrwd = { \grace { \small G32[ d32 c] } }
darodo = { \grace { \small G32[ d G c G] } }
Gdarodo = { \grace { \small d32[ G c G] } }
pdarodo = { \grace { \small G16[ d32 G c G16] } }
pGdarodo = { \grace { \small d32[ G c G16] } }
% Weird stuff from Joseph MacDonalds book
fifteenthcutting = { \grace { \small G32[ d G e a f a e a d] } }
fifteenthcuttingG = { \grace { \small G32[ d G e G f G e G d] } }
Gfifteenthcutting = { \grace { \small d32[ G e a f a e a d] } }
GfifteenthcuttingG = { \grace { \small d32[ G e G f G e G d] } }
seventeenthcutting = { \grace { \small G32[ d G e a f a e a d a c] } }
seventeenthcuttingG = { \grace { \small G32[ d G e G f G e G d G c] } }
Gseventeenthcutting = { \grace { \small d32[ G e a f a e a d a c] } }
fifteenthcutting = { \grace { \small G32[ d G e a f a e a d] } }
fifteenthcuttingG = { \grace { \small G32[ d G e G f G e G d] } }
Gfifteenthcutting = { \grace { \small d32[ G e a f a e a d] } }
GfifteenthcuttingG = { \grace { \small d32[ G e G f G e G d] } }
seventeenthcutting = { \grace { \small G32[ d G e a f a e a d a c] } }
seventeenthcuttingG = { \grace { \small G32[ d G e G f G e G d G c] } }
Gseventeenthcutting = { \grace { \small d32[ G e a f a e a d a c] } }
GseventeenthcuttingG = { \grace { \small d32[ G e G f G e G d G c] } }
barluadh = { \grace { \small G32[ d G e a f a e a d a c a b a e a f a] } }
barluadhG = { \grace { \small G32[ d G e G f G e G d G c G b G e G f G] } }
Gbarluadh = { \grace { \small d32[ G e a f a e a d a c a b a e a f a] } }
barluadh = { \grace { \small G32[ d G e a f a e a d a c a b a e a f a] } }
barluadhG = { \grace { \small G32[ d G e G f G e G d G c G b G e G f G] } }
Gbarluadh = { \grace { \small d32[ G e a f a e a d a c a b a e a f a] } }
GbarluadhG = { \grace { \small d32[ G e G f G e G d G c G b G e G f G] } }
% Non-gracenote piobaireachd markup.
trebling = \markup {
trebling = \markup {
\override #'(baseline-skip . 0.3)
\column {
\musicglyph #"scripts.tenuto"
\musicglyph #"scripts.tenuto"
\musicglyph #"scripts.tenuto"
\column {
\musicglyph #"scripts.tenuto"
\musicglyph #"scripts.tenuto"
\musicglyph #"scripts.tenuto"
}
}
% Abbreviated notation common in piobaireachd scores.
@ -333,11 +333,11 @@ txtaor = \markup { "T" }
txcrun = \markup { "C" }
txtaorcrun = \markup {
\override #'(baseline-skip . 1.8)
\column { "T" "C" }
\column { "T" "C" }
}
txtaoram = \markup { "T" }
txcrunam = \markup { "C" }
txtaorcrunam = \markup {
txtaorcrunam = \markup {
\override #'(baseline-skip . 1.8)
\column { "T" "C" }
}

View File

@ -10,7 +10,7 @@
#(set-global-staff-size 18)
#(set-default-paper-size "a4" 'landscape)
\include "bagpipe.ly"
\include "./bagpipe.ly"
\paper {
indent = 0\mm
@ -241,4 +241,4 @@
title = "Cheat sheet for entering bagpipe music"
subtitle = "Intended for Lilypond 2.11 or better"
tagline = \markup { "P/S Sven Axelsson, MPD" }
}
}

View File

@ -1,83 +0,0 @@

% Generated from /Users/sven/Documents/Music/Bagpipe/reels/joes_rant.ly by makelily.py
\version "2.11.43"
#(ly:set-option 'point-and-click #f)
#(set-global-staff-size 16)
#(set-default-paper-size "a4" 'portrait)
\include "./bagpipe.ly"
\include "./bagpipe_extra.ly"
\include "./format.ly"
% Local tweaks
\paper {
annotatespacing = ##f
ragged-bottom = ##t
}
% The tune to generate.
\version "2.11.43"
\score {
{
\bagpipeKey
\reelTime
% Part 1
\repeat volta 2 {
\grg d8 c \grg e c \grg d a \grg f g
A a \grA g a \grg f a \grg e f
\grA g e \grg f g \grA e d \grg b \grd c
\grG c d \grg e f \grA g e \grg f e
\grg d8 c \grg e c \grg d a \grg f g
A a \grA g a \grg f a \grg e f
\grA g e \grg f g \grA e d \grg c b
}
\alternative {
{ \grg a d \grG d c \grg d g \grA f e }
{ \grg a d \grG d c \grg d e \grg f g }
}
\break
% Part 2
A8 a \grA g a \grg f a \grg f g
A f \grA g e \grg f a \grg e f
\grA g e \grg f g \grA e d \grg b \grd c
\grG c d \grg e f \grA g e \grg f g
A8 a \grA g a \grg f a \grg f g
A f \grA g e \grg f a \grg e f
\grA g e \grg f g \grA e d \grg c b
\grg a d \grG d c \grg d e \grg f g
\break
A8 a \grA g a \grg f a \grg f g
A f \grA g e \grg f a \grg e f
\grA g e \grg f g \grA e f g e
\grg f g \grA e f g e \grg f e
\grg d c \grg e c \grg d a \grg f g
A a \grA g a \grg f a \grg e f
\grA g e \grg f g \grA e d \grg b \grd c
\grG c d \grg e f \grA g e \grg f e
\thrwd d2 ~ d
\bar "|."
}
\header {
breakbefore = #(break-before?)
meter = "Reel"
title = "Joes Rant"
composer = "Brian Lamond"
}
}

View File

@ -1,53 +0,0 @@

% Generated from /Users/sven/Documents/Music/Bagpipe/_sets/medley_2008_strasbourg.ly by makelily.py
\version "2.11.43"
#(ly:set-option 'point-and-click #f)
#(set-global-staff-size 16)
#(set-default-paper-size "a4" 'portrait)
\include "./bagpipe.ly"
\include "./bagpipe_extra.ly"
\include "./format.ly"
% Local tweaks
\paper {
annotatespacing = ##f
ragged-bottom = ##t
}
% The tune to generate.
\header {
title = "2008 Medley for Strasbourg"
}
\markuplines{\wordwrap{Four bars jig intro, then first four bars extending the
last note of bar 2 and 4 by four extra beats, then start again from the top.}}
\include "jigs/archie_beag.ly"
\include "airs/mist_covered_mountains.ly"
#(break-before-next-score)
\include "strathspeys/unknown.ly"
\include "strathspeys/mac_an_irish.ly"
\include "scandinavian/harp_schottis.ly"
#(break-before-next-score)
\include "reels/airlies_big_day.ly"
\include "reels/foot_it_neatly.ly"
\include "piobaireachd/lament_for_the_harp_tree.ly"
\markuplines{\wordwrap{Hold the cluster for 10 seconds or so, start with cuttings
from the top, one set of unison cuttings before the tune starts.}}
#(break-before-next-score)
\include "jigs/braes_of_mellinish.ly"
\markuplines{\wordwrap{Cluster like before, one single beat in jig tempo then
break immediately into hornpipe.}}
#(break-before-next-score)
\include "suites/murrays_fancy_6_hornpipe.ly"