Finally fixed note size not reset after grace notes.

Thanks to Jon Chalk <jchalk@400software.com> for noticing!
This commit is contained in:
Sven Axelsson 2011-10-25 16:53:24 +02:00
parent cfb1e47e76
commit 16bd8fbc2c
1 changed files with 161 additions and 160 deletions

View File

@ -138,214 +138,215 @@ stemspace = #(define-music-function (parser location extent) (pair?) #{
pgrace = #(define-music-function (parser location notes) (ly:music?) #{
\override Score.GraceSpacing #'spacing-increment = #0
\override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
\grace $notes
\small \grace $notes \normalsize
\revert Score.Stem #'beamlet-default-length
#})
% Single pgrace notes
grG = { \pgrace { \small G32 } }
gra = { \pgrace { \small a32 } }
grb = { \pgrace { \small b32 } }
grc = { \pgrace { \small c32 } }
grd = { \pgrace { \small d32 } }
gre = { \pgrace { \small e32 } }
grf = { \pgrace { \small f32 } }
grg = { \pgrace { \small g32 } }
grA = { \pgrace { \small A32 } }
grG = { \pgrace { G32 } }
gra = { \pgrace { a32 } }
grb = { \pgrace { b32 } }
grc = { \pgrace { c32 } }
grd = { \pgrace { d32 } }
gre = { \pgrace { e32 } }
grf = { \pgrace { f32 } }
grg = { \pgrace { g32 } }
grA = { \pgrace { A32 } }
% Doublings
dblG = { \pgrace { \small g32[ G d] } }
dbla = { \pgrace { \small g32[ a d] } }
dblb = { \pgrace { \small g32[ b d] } }
dblc = { \pgrace { \small g32[ c d] } }
dbld = { \pgrace { \small g32[ d e] } }
dble = { \pgrace { \small g32[ e f] } }
dblf = { \pgrace { \small g32[ f g] } }
dblG = { \pgrace { g32[ G d] } }
dbla = { \pgrace { g32[ a d] } }
dblb = { \pgrace { g32[ b d] } }
dblc = { \pgrace { g32[ c d] } }
dbld = { \pgrace { g32[ d e] } }
dble = { \pgrace { g32[ e f] } }
dblf = { \pgrace { g32[ f g] } }
% These are the same as the half doublings.
dblg = { \pgrace { \small g32[ f] } }
dblA = { \pgrace { \small A32[ g] } }
dblg = { \pgrace { g32[ f] } }
dblA = { \pgrace { A32[ g] } }
% Half doublings
hdblG = { \pgrace { \small G32[ d] } }
hdbla = { \pgrace { \small a32[ d] } }
hdblb = { \pgrace { \small b32[ d] } }
hdblc = { \pgrace { \small c32[ d] } }
hdbld = { \pgrace { \small d32[ e] } }
hdble = { \pgrace { \small e32[ f] } }
hdblf = { \pgrace { \small f32[ g] } }
hdblg = { \pgrace { \small g32[ f] } }
hdblA = { \pgrace { \small A32[ g] } }
hdblG = { \pgrace { G32[ d] } }
hdbla = { \pgrace { a32[ d] } }
hdblb = { \pgrace { b32[ d] } }
hdblc = { \pgrace { c32[ d] } }
hdbld = { \pgrace { d32[ e] } }
hdble = { \pgrace { e32[ f] } }
hdblf = { \pgrace { f32[ g] } }
hdblg = { \pgrace { g32[ f] } }
hdblA = { \pgrace { A32[ g] } }
% Thumb doublings
tdblG = { \pgrace { \small A32[ G d] } }
tdbla = { \pgrace { \small A32[ a d] } }
tdblb = { \pgrace { \small A32[ b d] } }
tdblc = { \pgrace { \small A32[ c d] } }
tdbld = { \pgrace { \small A32[ d e] } }
tdble = { \pgrace { \small A32[ e f] } }
tdblf = { \pgrace { \small A32[ f g] } }
tdblg = { \pgrace { \small A32[ g f] } }
tdblG = { \pgrace { A32[ G d] } }
tdbla = { \pgrace { A32[ a d] } }
tdblb = { \pgrace { A32[ b d] } }
tdblc = { \pgrace { A32[ c d] } }
tdbld = { \pgrace { A32[ d e] } }
tdble = { \pgrace { A32[ e f] } }
tdblf = { \pgrace { A32[ f g] } }
tdblg = { \pgrace { A32[ g f] } }
% Shakes
% A few of these can't really be played and are here only for consistency.
shakea = { \pgrace { \small g32[ a e a G] } }
shakeb = { \pgrace { \small g32[ b e b G] } }
shakec = { \pgrace { \small g32[ c e c G] } }
shaked = { \pgrace { \small g32[ d e d G] } }
shakee = { \pgrace { \small g32[ e f e a] } }
shakef = { \pgrace { \small g32[ f g f a] } }
shakeg = { \pgrace { \small A32[ f g a] } }
shakeA = { \pgrace { \small A32[ g A a] } }
shakea = { \pgrace { g32[ a e a G] } }
shakeb = { \pgrace { g32[ b e b G] } }
shakec = { \pgrace { g32[ c e c G] } }
shaked = { \pgrace { g32[ d e d G] } }
shakee = { \pgrace { g32[ e f e a] } }
shakef = { \pgrace { g32[ f g f a] } }
shakeg = { \pgrace { A32[ f g a] } }
shakeA = { \pgrace { A32[ g A a] } }
% Half shakes
hshakea = { \pgrace { \small a32[ d a G] } }
hshakeb = { \pgrace { \small b32[ d b G] } }
hshakec = { \pgrace { \small c32[ d c G] } }
hshaked = { \pgrace { \small d32[ e d G] } }
hshakee = { \pgrace { \small e32[ f e a] } }
hshakef = { \pgrace { \small f32[ g f a] } }
hshakeg = { \pgrace { \small g32[ f g a] } }
hshakeA = { \pgrace { \small A32[ g A a] } }
hshakea = { \pgrace { a32[ d a G] } }
hshakeb = { \pgrace { b32[ d b G] } }
hshakec = { \pgrace { c32[ d c G] } }
hshaked = { \pgrace { d32[ e d G] } }
hshakee = { \pgrace { e32[ f e a] } }
hshakef = { \pgrace { f32[ g f a] } }
hshakeg = { \pgrace { g32[ f g a] } }
hshakeA = { \pgrace { A32[ g A a] } }
% Thumb shakes
tshakea = { \pgrace { \small A32[ a d a G] } }
tshakeb = { \pgrace { \small A32[ b d b G] } }
tshakec = { \pgrace { \small A32[ c d c G] } }
tshaked = { \pgrace { \small A32[ d e d G] } }
tshakee = { \pgrace { \small A32[ e f e a] } }
tshakef = { \pgrace { \small A32[ f g f a] } }
tshakeg = { \pgrace { \small A32[ f g a] } }
tshakeA = { \pgrace { \small A32[ g A a] } }
tshakea = { \pgrace { A32[ a d a G] } }
tshakeb = { \pgrace { A32[ b d b G] } }
tshakec = { \pgrace { A32[ c d c G] } }
tshaked = { \pgrace { A32[ d e d G] } }
tshakee = { \pgrace { A32[ e f e a] } }
tshakef = { \pgrace { A32[ f g f a] } }
tshakeg = { \pgrace { A32[ f g a] } }
tshakeA = { \pgrace { A32[ g A a] } }
% Slurs
% A few of these can't really be played and are here only for consistency.
slura = { \pgrace { \small g32[ a G] } }
slurb = { \pgrace { \small g32[ b G] } }
slurc = { \pgrace { \small g32[ c G] } }
slurd = { \pgrace { \small g32[ d G] } }
wslurd = { \pgrace { \small g32[ d c] } }
slure = { \pgrace { \small g32[ e a] } }
slurf = { \pgrace { \small g32[ f a] } }
slurg = { \pgrace { \small A32[ f a] } }
slurA = { \pgrace { \small f32[ a] } }
slura = { \pgrace { g32[ a G] } }
slurb = { \pgrace { g32[ b G] } }
slurc = { \pgrace { g32[ c G] } }
slurd = { \pgrace { g32[ d G] } }
wslurd = { \pgrace { g32[ d c] } }
slure = { \pgrace { g32[ e a] } }
slurf = { \pgrace { g32[ f a] } }
slurg = { \pgrace { A32[ f a] } }
slurA = { \pgrace { f32[ a] } }
% Half slurs
hslura = { \pgrace { \small a32[ G] } }
hslurb = { \pgrace { \small b32[ G] } }
hslurc = { \pgrace { \small c32[ G] } }
hslurd = { \pgrace { \small d32[ G] } }
whslurd = { \pgrace { \small d32[ c] } }
hslure = { \pgrace { \small e32[ a] } }
hslurf = { \pgrace { \small f32[ a] } }
hslurg = { \pgrace { \small g32[ a] } }
hslurA = { \pgrace { \small A32[ a] } }
hslura = { \pgrace { a32[ G] } }
hslurb = { \pgrace { b32[ G] } }
hslurc = { \pgrace { c32[ G] } }
hslurd = { \pgrace { d32[ G] } }
whslurd = { \pgrace { d32[ c] } }
hslure = { \pgrace { e32[ a] } }
hslurf = { \pgrace { f32[ a] } }
hslurg = { \pgrace { g32[ a] } }
hslurA = { \pgrace { A32[ a] } }
% Thumb slurs
tslura = { \pgrace { \small A32[ a G] } }
tslurb = { \pgrace { \small A32[ b G] } }
tslurc = { \pgrace { \small A32[ c G] } }
tslurd = { \pgrace { \small A32[ d G] } }
wtslurd = { \pgrace { \small A32[ d c] } }
tslure = { \pgrace { \small A32[ e a] } }
tslurf = { \pgrace { \small A32[ f a] } }
tslurg = { \pgrace { \small A32[ f a] } }
tslurA = { \pgrace { \small f32[ a] } }
tslura = { \pgrace { A32[ a G] } }
tslurb = { \pgrace { A32[ b G] } }
tslurc = { \pgrace { A32[ c G] } }
tslurd = { \pgrace { A32[ d G] } }
wtslurd = { \pgrace { A32[ d c] } }
tslure = { \pgrace { A32[ e a] } }
tslurf = { \pgrace { A32[ f a] } }
tslurg = { \pgrace { A32[ f a] } }
tslurA = { \pgrace { f32[ a] } }
% Catches
catcha = { \pgrace { \small a32[ G d G] } }
catchb = { \pgrace { \small b32[ G d G] } }
catchc = { \pgrace { \small c32[ G d G] } }
catchd = { \pgrace { \small d32[ G b G] } }
catche = { \pgrace { \small e32[ G d G] } }
catcha = { \pgrace { a32[ G d G] } }
catchb = { \pgrace { b32[ G d G] } }
catchc = { \pgrace { c32[ G d G] } }
catchd = { \pgrace { d32[ G b G] } }
catche = { \pgrace { e32[ G d G] } }
% G-pgrace catches
gcatcha = { \pgrace { \small g32[ a G d G] } }
gcatchb = { \pgrace { \small g32[ b G d G] } }
gcatchc = { \pgrace { \small g32[ c G d G] } }
gcatchd = { \pgrace { \small g32[ d G b G] } }
gcatche = { \pgrace { \small g32[ e G d G] } }
gcatcha = { \pgrace { g32[ a G d G] } }
gcatchb = { \pgrace { g32[ b G d G] } }
gcatchc = { \pgrace { g32[ c G d G] } }
gcatchd = { \pgrace { g32[ d G b G] } }
gcatche = { \pgrace { g32[ e G d G] } }
% Thumb catches
tcatcha = { \pgrace { \small A32[ a G d G] } }
tcatchb = { \pgrace { \small A32[ b G d G] } }
tcatchc = { \pgrace { \small A32[ c G d G] } }
tcatchd = { \pgrace { \small A32[ d G b G] } }
tcatche = { \pgrace { \small A32[ e G d G] } }
tcatcha = { \pgrace { A32[ a G d G] } }
tcatchb = { \pgrace { A32[ b G d G] } }
tcatchc = { \pgrace { A32[ c G d G] } }
tcatchd = { \pgrace { A32[ d G b G] } }
tcatche = { \pgrace { A32[ e G d G] } }
% Triple strikes (BMW has them all, but I've never seen any but the A one used, so ...)
tripleA = { \pgrace { \small A32[ g A g A g] } }
tripleA = { \pgrace { A32[ g A g A g] } }
% Throws
thrwd = { \pgrace { \small G32[ d c] } }
Gthrwd = { \pgrace { \small d32[ c] } }
gripthrwd = { \pgrace { \small G32[ d G c] } }
thrwe = { \pgrace { \small e32[ a f a] } }
wthrwe = { \pgrace { \small e32[ d f d] } }
thrwf = { \pgrace { \small f32[ e g e] } }
thrwd = { \pgrace { G32[ d c] } }
Gthrwd = { \pgrace { d32[ c] } }
gripthrwd = { \pgrace { G32[ d G c] } }
thrwe = { \pgrace { e32[ a f a] } }
wthrwe = { \pgrace { e32[ d f d] } }
thrwf = { \pgrace { f32[ e g e] } }
% Birls
birl = { \pgrace { \small a32[ G a G] } }
wbirl = { \pgrace { \small G32[ a G] } }
gbirl = { \pgrace { \small g32[ a G a G] } }
dbirl = { \pgrace { \small d32[ a G a G] } }
birl = { \pgrace { a32[ G a G] } }
wbirl = { \pgrace { G32[ a G] } }
gbirl = { \pgrace { g32[ a G a G] } }
dbirl = { \pgrace { d32[ a G a G] } }
% Grips
grip = { \pgrace { \small G32[ d G] } }
dgrip = { \pgrace { \small G32[ b G] } }
egrip = { \pgrace { \small G32[ e G] } }
grip = { \pgrace { G32[ d G] } }
dgrip = { \pgrace { G32[ b G] } }
egrip = { \pgrace { G32[ e G] } }
% Taorluaths
taor = { \pgrace { \small G32[ d G e] } }
taorjmd = { \pgrace { \small G32[ d a e] } }
taorold = { \pgrace { \small G32[ d G a e] } }
dtaor = { \pgrace { \small G32[ b G e] } }
Gtaor = { \pgrace { \small d32[ G e] } }
taoramb = { \pgrace { \small G32[ d G b e] } }
taoramc = { \pgrace { \small G32[ d G c e] } }
taoramd = { \pgrace { \small G32[ d G c d e] } }
taor = { \pgrace { G32[ d G e] } }
taorjmd = { \pgrace { G32[ d a e] } }
taorold = { \pgrace { G32[ d G a e] } }
dtaor = { \pgrace { G32[ b G e] } }
Gtaor = { \pgrace { d32[ G e] } }
taoramb = { \pgrace { G32[ d G b e] } }
taoramc = { \pgrace { G32[ d G c e] } }
taoramd = { \pgrace { G32[ d G c d e] } }
% Crunluaths
crun = { \pgrace { \small G32[ d G e a f a ] } }
dcrun = { \pgrace { \small G32[ b G e a f a ] } }
Gcrun = { \pgrace { \small d32[ G e G f a ] } }
crunamb = { \pgrace { \small G32[ d G b e b f b ] } }
crunamc = { \pgrace { \small G32[ d G c e c f c ] } }
crunamd = { \pgrace { \small G32[ d G c d e d f d ] } }
crunambfosg = { \pgrace { \small e32[ b f b ] } }
crunamcfosg = { \pgrace { \small e32[ c f c ] } }
crunamdfosg = { \pgrace { \small e32[ d f d ] } }
crun = { \pgrace { G32[ d G e a f a ] } }
dcrun = { \pgrace { G32[ b G e a f a ] } }
Gcrun = { \pgrace { d32[ G e G f a ] } }
crunamb = { \pgrace { G32[ d G b e b f b ] } }
crunamc = { \pgrace { G32[ d G c e c f c ] } }
crunamd = { \pgrace { G32[ d G c d e d f d ] } }
crunambfosg = { \pgrace { e32[ b f b ] } }
crunamcfosg = { \pgrace { e32[ c f c ] } }
crunamdfosg = { \pgrace { e32[ d f d ] } }
% Special piobaireachd notations
grGcad = { \pgrace { \small G16 } }
gracad = { \pgrace { \small a16 } }
cad = { \pgrace { \small \stemspace #'(0 . 0.5) g32[ e8 d32] } }
hcad = { \pgrace { \small \stemspace #'(0 . 0.5) g32[ e8] } }
tcad = { \pgrace { \small e8[ d32] } }
thcad = { \pgrace { \small e8 } }
grGcad = { \pgrace { G16 } }
gracad = { \pgrace { a16 } }
cad = { \pgrace { \stemspace #'(0 . 0.5) g32[ e8 d32] } }
hcad = { \pgrace { \stemspace #'(0 . 0.5) g32[ e8] } }
tcad = { \pgrace { e8[ d32] } }
thcad = { \pgrace { e8 } }
% This is the same as thrwe
dre = { \pgrace { \small e32[ a f a] } }
dre = { \pgrace { e32[ a f a] } }
% This is the same as thrwf
dare = { \pgrace { \small f32[ e g e] } }
bari = { \pgrace { \small e32[ G f G] } }
dari = { \pgrace { \small f32[ e g e f e] } }
pthrwd = { \pgrace { \small G16[ d32 c] } }
darodo = { \pgrace { \small G32[ d G c G] } }
Gdarodo = { \pgrace { \small d32[ G c G] } }
pdarodo = { \pgrace { \small G16[ d32 G c G16] } }
pGdarodo = { \pgrace { \small d32[ G c G16] } }
dare = { \pgrace { f32[ e g e] } }
bari = { \pgrace { e32[ G f G] } }
dari = { \pgrace { f32[ e g e f e] } }
fdari = { \pgrace { e32[ g e f e] } }
pthrwd = { \pgrace { G16[ d32 c] } }
darodo = { \pgrace { G32[ d G c G] } }
Gdarodo = { \pgrace { d32[ G c G] } }
pdarodo = { \pgrace { G16[ d32 G c G16] } }
pGdarodo = { \pgrace { d32[ G c G16] } }
% Weird stuff from Joseph MacDonalds book
fifteenthcutting = { \pgrace { \small G32[ d a e a f a e a d] } }
fifteenthcuttingG = { \pgrace { \small G32[ d a e G f G e G d] } }
Gfifteenthcutting = { \pgrace { \small d32[ a e a f a e a d] } }
GfifteenthcuttingG = { \pgrace { \small d32[ a e G f G e G d] } }
seventeenthcutting = { \pgrace { \small G32[ d a e a f a e a d a c] } }
seventeenthcuttingG = { \pgrace { \small G32[ d a e G f G e G d G c] } }
Gseventeenthcutting = { \pgrace { \small d32[ a e a f a e a d a c] } }
GseventeenthcuttingG = { \pgrace { \small d32[ a e G f G e G d G c] } }
barluadh = { \pgrace { \small G32[ d a e a f a e a d a c a b a e a f a] } }
barluadhG = { \pgrace { \small G32[ d a e G f G e G d G c G b G e G f G] } }
Gbarluadh = { \pgrace { \small d32[ a e a f a e a d a c a b a e a f a] } }
GbarluadhG = { \pgrace { \small d32[ a e G f G e G d G c G b G e G f G] } }
fifteenthcutting = { \pgrace { G32[ d a e a f a e a d] } }
fifteenthcuttingG = { \pgrace { G32[ d a e G f G e G d] } }
Gfifteenthcutting = { \pgrace { d32[ a e a f a e a d] } }
GfifteenthcuttingG = { \pgrace { d32[ a e G f G e G d] } }
seventeenthcutting = { \pgrace { G32[ d a e a f a e a d a c] } }
seventeenthcuttingG = { \pgrace { G32[ d a e G f G e G d G c] } }
Gseventeenthcutting = { \pgrace { d32[ a e a f a e a d a c] } }
GseventeenthcuttingG = { \pgrace { d32[ a e G f G e G d G c] } }
barluadh = { \pgrace { G32[ d a e a f a e a d a c a b a e a f a] } }
barluadhG = { \pgrace { G32[ d a e G f G e G d G c G b G e G f G] } }
Gbarluadh = { \pgrace { d32[ a e a f a e a d a c a b a e a f a] } }
GbarluadhG = { \pgrace { d32[ a e G f G e G d G c G b G e G f G] } }
% Non-gracenote piobaireachd markup.
trebling = \markup {
\override #'(baseline-skip . 0.4)