mirror of
https://github.com/kastdeur/lilydrum.git
synced 2024-12-22 09:13:33 +01:00
various small updates in non-music files
This commit is contained in:
parent
87c2ef5fd8
commit
15ce8e7c1e
11 changed files with 137 additions and 47 deletions
|
@ -1,7 +1,7 @@
|
|||
% ================================================= %
|
||||
% Flams, Drags & the sort %
|
||||
% ================================================= %
|
||||
drumgrace = #(define-music-function (parser location notes) (ly:music?) #{
|
||||
drumgrace = #(define-music-function (parser location notes ) ( ly:music? ) #{
|
||||
% Set settings
|
||||
\stemUp
|
||||
\once \override Beam.positions = #'(2 . 2)
|
||||
|
@ -11,7 +11,7 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{
|
|||
\override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
|
||||
|
||||
% Print notes
|
||||
\grace $notes
|
||||
\small \grace $notes
|
||||
|
||||
% Revert back
|
||||
\revert Score.Stem #'beamlet-default-length
|
||||
|
@ -27,22 +27,28 @@ flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start re
|
|||
flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat
|
||||
|
||||
% Drags
|
||||
dragd = \drummode { \drumgrace { g16[ g] }} % Drag right
|
||||
dragg = \drummode { \drumgrace { d16[ d] }} % Drag left
|
||||
dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % Drag right with start repeat
|
||||
draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % Drag left with start repeat
|
||||
dragd = \drummode { \drumgrace { g16[ g] } } % Drag right
|
||||
dragg = \drummode { \drumgrace { d16[ d] } } % Drag left
|
||||
dragddr = \drummode { \drumgrace { g16[\startGroup g] } } % Drag right with start repeat
|
||||
draggdr = \drummode { \drumgrace { d16[\startGroup d] } } % Drag left with start repeat
|
||||
|
||||
% Open Drags
|
||||
odragd = \drummode { \drumgrace { g16[ s^"o" g] } } % Open Drag right
|
||||
odragg = \drummode { \drumgrace { d16[ s^"o" d] } } % Open Drag left
|
||||
odragddr = \drummode { \drumgrace { g16[\startGroup s^"o" g] } } % Open Drag right with start repeat
|
||||
odraggdr = \drummode { \drumgrace { d16[\startGroup s^"o" d] } } % Open Drag left with start repeat
|
||||
|
||||
% Ruff
|
||||
ruffg = \drummode { \drumgrace { g16[ d g] }} % Ruff right
|
||||
ruffd = \drummode { \drumgrace { d16[ g d] }} % Ruff left
|
||||
ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % Ruff right with start repeat
|
||||
ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % Ruff left with start repeat
|
||||
ruffg = \drummode { \drumgrace { g16[ d g] } } % Ruff right
|
||||
ruffd = \drummode { \drumgrace { d16[ g d] } } % Ruff left
|
||||
ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] } } % Ruff right with start repeat
|
||||
ruffddr = \drummode { \drumgrace { d16[\startGroup g d] } } % Ruff left with start repeat
|
||||
|
||||
% Swiss Ruff
|
||||
sruffg = \drummode { \drumgrace { g16[ d d] }} % Swiss Ruff right
|
||||
sruffd = \drummode { \drumgrace { d16[ g g] }} % Swiss Ruff left
|
||||
sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % Swiss Ruff right with start repeat
|
||||
sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % Swiss Ruff left with start repeat
|
||||
sruffg = \drummode { \drumgrace { g16[ d d] } } % Swiss Ruff right
|
||||
sruffd = \drummode { \drumgrace { d16[ g g] } } % Swiss Ruff left
|
||||
sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] } } % Swiss Ruff right with start repeat
|
||||
sruffddr = \drummode { \drumgrace { d16[\startGroup g g] } } % Swiss Ruff left with start repeat
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%% Embellishment functions, automatic left or right %%
|
||||
|
@ -69,6 +75,16 @@ drag = #(define-music-function (parser location note) (ly:music?) #{
|
|||
% print the note, else it won't show up
|
||||
$note
|
||||
#})
|
||||
% Open Drag
|
||||
odrag = #(define-music-function (parser location note) (ly:music?) #{
|
||||
% is note right-handed? then \flamd
|
||||
% if left, then \flamg
|
||||
#(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand")
|
||||
#{ \odragg #}
|
||||
#{ \odragd #})
|
||||
% print the note, else it won't show up
|
||||
$note
|
||||
#})
|
||||
|
||||
% Ruff
|
||||
ruff = #(define-music-function (parser location note) (ly:music?) #{
|
||||
|
|
|
@ -24,13 +24,20 @@ scoop = \markup {
|
|||
(lineto 7 1 )
|
||||
)
|
||||
}
|
||||
|
||||
scoopo = #(define-music-function (parser location beg notes) (ly:music? ly:music?)
|
||||
#{
|
||||
%Set spanner from first to last note
|
||||
$beg
|
||||
\startGroup
|
||||
$notes
|
||||
\stopGroup
|
||||
#})
|
||||
flourish = #(define-music-function (parser location notes) (ly:music?)
|
||||
#{
|
||||
\temporary \override Staff.NoteHead.style = #'cross
|
||||
$notes
|
||||
\revert Staff.NoteHead.style
|
||||
#})
|
||||
#{
|
||||
\temporary \override Staff.NoteHead.style = #'cross
|
||||
$notes
|
||||
\revert Staff.NoteHead.style
|
||||
#})
|
||||
sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music?)
|
||||
#{
|
||||
$notes
|
||||
|
|
|
@ -28,6 +28,7 @@ drumPitchNames =
|
|||
}
|
||||
}
|
||||
\layout {
|
||||
indent = 0.0
|
||||
\context {
|
||||
\DrumStaff
|
||||
\name PipeBandDrumStaff
|
||||
|
@ -93,4 +94,21 @@ drumPitchNames =
|
|||
\StaffGroup
|
||||
\accepts "PipeBandDrumStaff"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
% =================================================== %
|
||||
% *Shorts* for Naming %
|
||||
% =================================================== %
|
||||
|
||||
instrumentSide = "Side"
|
||||
instrumentTenor = "Tenor"
|
||||
instrumentBass = "Bass"
|
||||
instrumentPipes = "Pipes"
|
||||
shortInstrumentSide = "S.D."
|
||||
shortInstrumentTenor = "T.D."
|
||||
shortInstrumentBass = "B.D."
|
||||
shortInstrumentPipes = "P."
|
||||
composerSide = ""
|
||||
composerTenor = ""
|
||||
composerBass = ""
|
||||
composerPipes = ""
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
eighthBeaming = {
|
||||
\set baseMoment = #(ly:make-moment 1/8)
|
||||
\set beatStructure = #'( 2 )
|
||||
\set beatStructure = #'( 2 2 )
|
||||
}
|
||||
compoundEighthBeaming = {
|
||||
\set baseMoment = #(ly:make-moment 1/8)
|
||||
|
|
6
airs/my_home/notes.bass.ily
Executable file
6
airs/my_home/notes.bass.ily
Executable file
|
@ -0,0 +1,6 @@
|
|||
% 6/8 My Home
|
||||
% Bass
|
||||
\version "2.18.2"
|
||||
composerBass = ""
|
||||
bassA = \drummode {
|
||||
}
|
|
@ -4,5 +4,11 @@ MKDRUMCOMMAND="./makedrum"
|
|||
|
||||
for d in *_marches strathspeys standards jigs airs hornpipes other
|
||||
do
|
||||
$MKDRUMCOMMAND $d/*.ly
|
||||
for f in $d/*.ly $d/*/*.ly
|
||||
do
|
||||
if [ ! -f $f ] ; then
|
||||
continue
|
||||
fi
|
||||
$MKDRUMCOMMAND $f
|
||||
done;
|
||||
done;
|
||||
|
|
|
@ -21,24 +21,22 @@
|
|||
\include "lilydrum.ly"
|
||||
|
||||
\score {
|
||||
\new DrumStaff {
|
||||
\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
|
||||
\new PipeBandDrumStaff {
|
||||
\set Staff.instrumentName = "Plain notes"
|
||||
\drummode {
|
||||
d4 g dcross gcross \rimshot d \rimshot g dback gback
|
||||
d4 g \crossstick d \crossstick g \rimshot d \rimshot g \backstick d \backstick g
|
||||
}
|
||||
}
|
||||
\addlyrics {
|
||||
d g dcross gcross "\rimshot d" "\rimshot g" dback gback
|
||||
"d" "g" "\crossstick d" "\crossstick g" "\rimshot d" "\rimshot g" "\backstick d" "\backstick g"
|
||||
}
|
||||
}
|
||||
|
||||
\score {
|
||||
\new DrumStaff {
|
||||
\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
|
||||
\new PipeBandDrumStaff {
|
||||
\set Staff.instrumentName = "Tenor Flourishing"
|
||||
\drummode {
|
||||
d^\splitTheFeather g^\cartWheel d^\up {\scoop d8 g8 d4} g d \flourish { d4 g d g }
|
||||
d^\splitTheFeather g^\cartWheel d^\up {d8 g8 d4} g d \flourish { d4 g d g }
|
||||
}
|
||||
}
|
||||
\addlyrics {
|
||||
|
@ -46,17 +44,58 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
\score {
|
||||
\new DrumStaff {
|
||||
\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
|
||||
\set Staff.instrumentName = "Tenor Flourishing"
|
||||
\new PipeBandDrumStaff {
|
||||
\set Staff.instrumentName = "Embellishments"
|
||||
\time 2/4
|
||||
\drummode {
|
||||
\partial 8 d8:32( |
|
||||
\triplet { g16) d g} \flam d16. g32 \drag g16 g16 \triplet { d16 g:64 d->}
|
||||
\flam d \flam g
|
||||
\drag d \drag g
|
||||
\odrag d \odrag g
|
||||
\ruff d \ruff g
|
||||
\sruff d \sruff g
|
||||
}
|
||||
}
|
||||
\addlyrics {
|
||||
"\flam d" "\flam g"
|
||||
"\drag d" "\drag g"
|
||||
"\odrag d" "\odrag g"
|
||||
"\ruff d" "\ruff g"
|
||||
"\sruff d" "\sruff g"
|
||||
}
|
||||
}
|
||||
\score {
|
||||
\new PipeBandDrumStaff {
|
||||
\set Staff.instrumentName = \markup \column { \line{Forced hand} \line{embellishments}}
|
||||
\time 2/4
|
||||
\drummode {
|
||||
\flamg d \flamd g
|
||||
\dragg d \dragd g
|
||||
\odragg d \odragd g
|
||||
\ruffg d \ruffd g
|
||||
\sruffg d \sruffd g
|
||||
}
|
||||
}
|
||||
\addlyrics {
|
||||
"\flamg d" "\flamd g"
|
||||
"\dragg d" "\dragd g"
|
||||
"\odragg d" "\odragd g"
|
||||
"\ruffg d" "\ruffd g"
|
||||
"\sruffg d" "\sruffd g"
|
||||
}
|
||||
}
|
||||
\score {
|
||||
\new PipeBandDrumStaff {
|
||||
\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
|
||||
\set Staff.instrumentName = "Rolls"
|
||||
\drummode {
|
||||
d4:32( d8:32)(-> g8) \flam d4 r8 d8:32( \dr |
|
||||
\triplet { g16) d g } \drag d16. g32 d32 g d g d16. g32-> d16. d32 \flam g4
|
||||
}
|
||||
}
|
||||
\addlyrics {
|
||||
\partial 8
|
||||
"d8:32(" "\\triplet " -- "\\flam d16." "g32" -- "\\drag g16" -- "\\triplet" "g:64" "d-> }"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Recursively remove all pdfs from this directory
|
||||
rm -v -R *.pdf
|
||||
rm -v -R /snare/*.pdf
|
||||
rm -v -R /tenor/*.pdf
|
||||
rm -v -R /bass/*.pdf
|
|
@ -22,9 +22,13 @@ today = #(strftime "%B %e, %Y" (localtime (current-time)))
|
|||
\bold \fromproperty #'header:subtitle
|
||||
}
|
||||
\fromproperty #'header:meter
|
||||
\column {
|
||||
\column \right-align {
|
||||
\fromproperty #'header:instrument
|
||||
\line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
|
||||
\line {
|
||||
\fromproperty #'header:composer
|
||||
$(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger))
|
||||
(markup " "))
|
||||
\italic \fromproperty #'header:arranger }
|
||||
}
|
||||
}
|
||||
$(if (not (ly:get-option 'without-comment))
|
||||
|
|
1
makedrum
1
makedrum
|
@ -203,7 +203,6 @@ class MakeDrum:
|
|||
if line.startswith(u'\\include'):
|
||||
# Rewrite includes to absolute location of file
|
||||
incline = line.replace('\\include', '').strip('"\' ')
|
||||
print("include "+incline)
|
||||
if not incline.startswith('\\'): #already absolute
|
||||
incline = os.path.join(os.path.relpath(os.path.dirname(file)), incline)
|
||||
line = "\\include \""+incline+"\""
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
\new PipeBandDrumStaff {
|
||||
\eighthBeaming
|
||||
\time 4/4
|
||||
\drummode{
|
||||
\repeat volta 2{
|
||||
\partial 8 d16. g32 |
|
||||
\flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( |
|
||||
|
@ -80,8 +81,8 @@
|
|||
\tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 g8 |
|
||||
\flamd d4 d4:32( d4) r8
|
||||
}
|
||||
|
||||
}% End of drums %
|
||||
}% End of drums %
|
||||
}
|
||||
|
||||
\header {
|
||||
title = "4/4 Standards"
|
||||
|
|
Loading…
Reference in a new issue