diff --git a/lib/embellishments.ily b/lib/embellishments.ily index ca2a2c3..a446b3b 100644 --- a/lib/embellishments.ily +++ b/lib/embellishments.ily @@ -31,11 +31,11 @@ dragg = \drummode { \drumgrace { d16[ d] } } % Drag left dragddr = \drummode { \drumgrace { g16[\dr g] } } % Drag right with start repeat draggdr = \drummode { \drumgrace { d16[\dr d] } } % Drag left with start repeat -% Open Drags -odragd = \drummode { \drumgrace { g16[ <>^"o" g] } } % Open Drag right -odragg = \drummode { \drumgrace { d16[ <>^"o" d] } } % Open Drag left -odragddr = \drummode { \drumgrace { g16[\dr <>^"o" g] } } % Open Drag right with start repeat -odraggdr = \drummode { \drumgrace { d16[\dr <>^"o" d] } } % Open Drag left with start repeat +% open drags +odragd = \drummode { \drumgrace { << { g16[ g] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } } % Open Drag right +odragg = \drummode { \drumgrace { << { d16[ d] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } } % Open Drag left +odragddr = \drummode { \drumgrace { << { d16[\dr d] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } } % Open Drag right with start repeat +odraggdr = \drummode { \drumgrace { << { g16[\dr g] } { s32 s32^\markup { \musicglyph #"scripts.open" } } >> } } % Open Drag left with start repeat % Ruff ruffg = \drummode { \drumgrace { g16[ d g] } } % Ruff right @@ -64,7 +64,7 @@ sruffddr = \drummode { \drumgrace { d16[\dr g g] } } % Swiss Ruff left with sta #{ $right #}) % print the note, else it won't show up - $note + #note #} ) ) diff --git a/lib/rehearsal_marks.ily b/lib/rehearsal_marks.ily index e95408b..03a0e43 100644 --- a/lib/rehearsal_marks.ily +++ b/lib/rehearsal_marks.ily @@ -2,7 +2,7 @@ % Rehearsal Marks % % ================================================= % #(newline) -#(display "Midi Support loaded") +#(display "Rehearsal Marks loaded") % From Svenax's bagpipemusic markText = #(define-music-function (parser location text) (string?) #{ \once \override Score.RehearsalMark #'self-alignment-X = #LEFT @@ -29,4 +29,4 @@ altBracket = #(define-music-function (parser location tag) (string?) #{ % Short al fine's and stuff dacapoalfine = {\markTextEol "D.C. al fine" } - +fine = {\markTextEol "Fine" } diff --git a/lib/special_sticking.ily b/lib/special_sticking.ily index 26757fe..aa3a120 100644 --- a/lib/special_sticking.ily +++ b/lib/special_sticking.ily @@ -6,7 +6,7 @@ backstick = #(define-music-function (parser location notes) (ly:music?) #{ \temporary \override Staff.NoteHead.style = #'triangle \temporary \override Staff.NoteHead.font-size = #1.2 - $notes + #notes \revert Staff.NoteHead.font-size \revert Staff.NoteHead.style #}) @@ -14,21 +14,17 @@ crossstick = #(define-music-function (parser location notes) (ly:music?) #{ \temporary \override Staff.NoteHead.style = #'xcircle \temporary \override Staff.NoteHead.font-size = #1.2 - $notes + #notes \revert Staff.NoteHead.font-size \revert Staff.NoteHead.style #}) rimshot = #(define-music-function (parser location notes) (ly:music?) #{ \temporary \override Staff.NoteHead.font-size = #1.2 - %\temporary \override Staff.NoteHead.stencil = #ly:text-interface::print - %\temporary \override Staff.NoteHead.text = \markup { - % \combine - % \halign #-0.7 \draw-circle #0.85 #0.2 ##f - % \musicglyph #"noteheads.normal" - %} - $notes - %\revert Staff.NoteHead.stencil - %\revert Staff.NoteHead.text + \temporary \override Staff.NoteHead.stencil = #ly:text-interface::print + \temporary \override Staff.NoteHead.text = \markup { \musicglyph #"scripts.halfopen" } + #notes + \revert Staff.NoteHead.stencil + \revert Staff.NoteHead.text \revert Staff.NoteHead.font-size #})