mirror of
https://github.com/kastdeur/lilydrum.git
synced 2024-12-23 01:33:32 +01:00
Moved lilydrum directory
small changes to headers
This commit is contained in:
parent
34641ea703
commit
e574767762
13 changed files with 30 additions and 21 deletions
|
@ -8,10 +8,7 @@ up = \markup {
|
||||||
%\center-column {
|
%\center-column {
|
||||||
\combine
|
\combine
|
||||||
\draw-line #'(0 . -2) % draw stick
|
\draw-line #'(0 . -2) % draw stick
|
||||||
\combine % draw arrow
|
\arrow-head #Y #UP ##f
|
||||||
\draw-line #'(0.5 . -1)
|
|
||||||
\draw-line #'(-0.5 . -1)
|
|
||||||
%\arrow-head #Y #UP ##f
|
|
||||||
%}
|
%}
|
||||||
}
|
}
|
||||||
bfly = \markup {
|
bfly = \markup {
|
|
@ -10,7 +10,7 @@ today = #(strftime "%B %e, %Y" (localtime (current-time)))
|
||||||
raggedbottom = ##t
|
raggedbottom = ##t
|
||||||
tagline = \markup {
|
tagline = \markup {
|
||||||
\line {
|
\line {
|
||||||
"Cpl Eric Teunis de Boone, Seaforths of Holland,"
|
"Cpl ET de Boone, Seaforths of Holland,"
|
||||||
\concat { "(rev. " \today ")" }
|
\concat { "(rev. " \today ")" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,8 +23,11 @@ today = #(strftime "%B %e, %Y" (localtime (current-time)))
|
||||||
\bold \fromproperty #'header:subtitle
|
\bold \fromproperty #'header:subtitle
|
||||||
}
|
}
|
||||||
\fromproperty #'header:meter
|
\fromproperty #'header:meter
|
||||||
|
\column {
|
||||||
|
\fromproperty #'header:instrument
|
||||||
\line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
|
\line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$(if (not (ly:get-option 'without-comment))
|
$(if (not (ly:get-option 'without-comment))
|
||||||
(markup #:justify-field 'header:comment)
|
(markup #:justify-field 'header:comment)
|
||||||
(markup))
|
(markup))
|
||||||
|
|
10
lilydrum.ly
10
lilydrum.ly
|
@ -27,8 +27,8 @@
|
||||||
#(ly:set-option 'point-and-click #f)
|
#(ly:set-option 'point-and-click #f)
|
||||||
#(ly:set-option 'relative-includes #t)
|
#(ly:set-option 'relative-includes #t)
|
||||||
|
|
||||||
\include "lilydrum/layout_tweaks.ily"
|
\include ".lilydrum/layout_tweaks.ily"
|
||||||
\include "lilydrum/musical_functions.ily"
|
\include ".lilydrum/musical_functions.ily"
|
||||||
\include "lilydrum/embellishments.ily"
|
\include ".lilydrum/embellishments.ily"
|
||||||
\include "lilydrum/flourishing.ily"
|
\include ".lilydrum/flourishing.ily"
|
||||||
\include "lilydrum/special_sticking.ily"
|
\include ".lilydrum/special_sticking.ily"
|
||||||
|
|
9
makedrum
9
makedrum
|
@ -122,6 +122,8 @@ class MakeDrum:
|
||||||
header_format = "header_book"
|
header_format = "header_book"
|
||||||
else:
|
else:
|
||||||
header_format = "header_default"
|
header_format = "header_default"
|
||||||
|
else:
|
||||||
|
header_format = "header_" + self.args.format
|
||||||
|
|
||||||
tmp_file = self.maketemplate(tmp_dir, file, header_format)
|
tmp_file = self.maketemplate(tmp_dir, file, header_format)
|
||||||
|
|
||||||
|
@ -198,6 +200,13 @@ class MakeDrum:
|
||||||
printit = 1
|
printit = 1
|
||||||
for line in music:
|
for line in music:
|
||||||
if line.startswith(u'\\include "lilydrum.ly"'): continue
|
if line.startswith(u'\\include "lilydrum.ly"'): continue
|
||||||
|
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+"\""
|
||||||
if printit:
|
if printit:
|
||||||
out_file.write(line.replace('\r', '')+'\n')
|
out_file.write(line.replace('\r', '')+'\n')
|
||||||
out_file.close()
|
out_file.close()
|
||||||
|
|
|
@ -10,20 +10,20 @@
|
||||||
\repeat volta 2 {
|
\repeat volta 2 {
|
||||||
d4 g4 d8. g16 d4
|
d4 g4 d8. g16 d4
|
||||||
d4 g4 r8. g16 d4
|
d4 g4 r8. g16 d4
|
||||||
d4 d4 g4 g4
|
\flourish { d4 d4 g4 g4 }
|
||||||
d4 g4 d4 g4
|
\flourish d4 \flourish g4 d4^\up g4^\up
|
||||||
}
|
}
|
||||||
\break
|
\break
|
||||||
d4 g4 d4 g4
|
d4^\up g4^\up \flourish { d4 g4 }
|
||||||
d4 d8. g16 r8. g16 d4
|
d4 \parenthesize d8. g16 r8. g16 d4
|
||||||
d4 g4 d8. g16 d4
|
\flourish { d4 d4 g4 g4 }
|
||||||
d4 g4 d4 g4
|
\flourish d4 \flourish g4 d4^\up g4^\up
|
||||||
|
|
||||||
\break
|
\break
|
||||||
d4 g4 d4 g4
|
d4^\up g4^\up \flourish { d4 g4 }
|
||||||
d4 d8. g16 r8. g16 d4
|
d4 \parenthesize d8. g16 r8. g16 d4
|
||||||
d4 d4 g4 g4
|
d4 g4 d8. g16 d4
|
||||||
d4 g4 d4 g4
|
\flourish d4 \flourish g4 d4^\up g4^\up
|
||||||
\bar "|."
|
\bar "|."
|
||||||
|
|
||||||
}% End of drums %
|
}% End of drums %
|
||||||
|
|
Loading…
Reference in a new issue