From bd29d4f030955be84ae5e269da40c4e830b9dd20 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Thu, 3 Jan 2019 17:32:41 +0100 Subject: [PATCH] Moved Pitchnames into own file --- bagpipe.ly | 25 ++----------------------- lib/pitchnames.ily | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 lib/pitchnames.ily diff --git a/bagpipe.ly b/bagpipe.ly index 5df3a8c..169b422 100644 --- a/bagpipe.ly +++ b/bagpipe.ly @@ -1,4 +1,4 @@ -%{ +%{ Bagpipe music settings for Lilypond. This file builds on work by Andrew McNabb (http://www.mcnabbs.org/andrew/) @@ -9,28 +9,6 @@ \version "2.19.28" -% Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. -% Flat notes used mainly in some modern music. - -pitchnamesBagpipe = #`( - (G . ,(ly:make-pitch 0 4 NATURAL)) - (a . ,(ly:make-pitch 0 5 NATURAL)) - (b . ,(ly:make-pitch 0 6 NATURAL)) - (bflat . ,(ly:make-pitch 0 6 FLAT)) - (c . ,(ly:make-pitch 1 0 SHARP)) - (cflat . ,(ly:make-pitch 1 0 FLAT)) - (d . ,(ly:make-pitch 1 1 NATURAL)) - (e . ,(ly:make-pitch 1 2 NATURAL)) - (f . ,(ly:make-pitch 1 3 SHARP)) - (fflat . ,(ly:make-pitch 1 3 FLAT)) - (g . ,(ly:make-pitch 1 4 NATURAL)) - (gflat . ,(ly:make-pitch 1 4 FLAT)) - (A . ,(ly:make-pitch 1 5 NATURAL)) - (B . ,(ly:make-pitch 1 6 NATURAL)) - (C . ,(ly:make-pitch 2 0 SHARP)) -) -pitchnames = \pitchnamesBagpipe -#(ly:parser-set-note-names pitchnames) % Bagpipe music is written in something like D major. If we use % flattened notes, the flat should be shown on all instances. @@ -133,4 +111,5 @@ marchTime = { #(ly:set-option 'relative-includes #t) +\include "lib/pitchnames.ily" \include "lib/embellishments.ily" diff --git a/lib/pitchnames.ily b/lib/pitchnames.ily new file mode 100644 index 0000000..d8e8af8 --- /dev/null +++ b/lib/pitchnames.ily @@ -0,0 +1,27 @@ +% =================================================== % +% Pitch Names % +% =================================================== % + +% Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. +% Flat notes used mainly in some modern music. + +pitchnamesBagpipe = #`( + (G . ,(ly:make-pitch 0 4 NATURAL)) + (a . ,(ly:make-pitch 0 5 NATURAL)) + (b . ,(ly:make-pitch 0 6 NATURAL)) + (bflat . ,(ly:make-pitch 0 6 FLAT)) + (c . ,(ly:make-pitch 1 0 SHARP)) + (cflat . ,(ly:make-pitch 1 0 FLAT)) + (d . ,(ly:make-pitch 1 1 NATURAL)) + (e . ,(ly:make-pitch 1 2 NATURAL)) + (f . ,(ly:make-pitch 1 3 SHARP)) + (fflat . ,(ly:make-pitch 1 3 FLAT)) + (g . ,(ly:make-pitch 1 4 NATURAL)) + (gflat . ,(ly:make-pitch 1 4 FLAT)) + (A . ,(ly:make-pitch 1 5 NATURAL)) + (B . ,(ly:make-pitch 1 6 NATURAL)) + (C . ,(ly:make-pitch 2 0 SHARP)) +) +pitchnames = \pitchnamesBagpipe +#(ly:parser-set-note-names pitchnames) +