From 0f94519b8bb2a0f7b6c48e99de7ff8050049575e Mon Sep 17 00:00:00 2001 From: Daniel Benjamin Miller Date: Fri, 12 Jul 2024 13:33:12 -0400 Subject: [PATCH 1/3] Use dot-stencil to let LilyPond position the SMUFL font's dots --- ly/esmufl.ily | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ly/esmufl.ily b/ly/esmufl.ily index 33ccf27..48f6c6d 100644 --- a/ly/esmufl.ily +++ b/ly/esmufl.ily @@ -1175,11 +1175,11 @@ ekmMakeClusters = (let cat ((c (max count 0)) (r (if pad point-stencil empty-stencil))) (if (zero? c) r - (cat (1- c) (ly:stencil-stack r X RIGHT dot ext)))))) + (cat (1- c) (ly:stencil-stack r X RIGHT dot 0)))))) #(define (ekm-dots grob) (ekm-cat-dots - (ly:grob-property grob 'dot-count) + 1 (ekm-cchar grob 0 #xE1E7) #t)) @@ -3364,7 +3364,7 @@ ekmSmuflOn = \override NoteHead.stencil = #ekm-notehead #}) (on 'dot #{ - \override Dots.stencil = #ekm-dots + \override Dots.dot-stencil = #ekm-dots #}) (on 'flag #{ \override Stem.details.lengths = #(ekm-stemlength 'default) @@ -3449,7 +3449,7 @@ ekmSmuflOff = \revert NoteHead.stencil #}) (on 'dot #{ - \revert Dots.stencil + \revert Dots.dot-stencil #}) (on 'flag #{ \revert Stem.details.lengths From 42025885652e93c04acf35cec2589c3de73078f8 Mon Sep 17 00:00:00 2001 From: Daniel Benjamin Miller Date: Fri, 12 Jul 2024 13:33:53 -0400 Subject: [PATCH 2/3] Fix size of grace note slash to match SMUFL fonts --- ly/esmufl.ily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ly/esmufl.ily b/ly/esmufl.ily index 48f6c6d..e02e425 100644 --- a/ly/esmufl.ily +++ b/ly/esmufl.ily @@ -1253,7 +1253,7 @@ ekmMakeClusters = (grob-interpret-markup grob (make-translate-scaled-markup (cons -0.55 (* -2.5 dir)) - (make-fontsize-markup 3 + (make-fontsize-markup 0 (make-ekm-char-markup (if (positive? dir) #xE564 #xE565)))))) flg) From e1d85a3d655da292154458d9a776c0b6c2831e9f Mon Sep 17 00:00:00 2001 From: Daniel Benjamin Miller <43855846+dbenjaminmiller@users.noreply.github.com> Date: Wed, 17 Jul 2024 14:16:47 -0400 Subject: [PATCH 3/3] Update to match https://github.com/tr-igem/esmuflily/commit/10233dde63db42d099984496fef7318f3162eb5b?diff=split&w=0 --- ly/esmufl.ily | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ly/esmufl.ily b/ly/esmufl.ily index ff1fd85..00fa4c7 100644 --- a/ly/esmufl.ily +++ b/ly/esmufl.ily @@ -1252,10 +1252,10 @@ ekmMakeClusters = flg (grob-interpret-markup grob (make-translate-scaled-markup - (cons -0.55 (* -2.5 dir)) - (make-fontsize-markup 0 - (make-ekm-char-markup - (if (positive? dir) #xE564 #xE565)))))) + (if (= UP dir) + (cons -0.644 -2.456) + (cons -0.596 2.168)) + (make-ekm-char-markup (if (= UP dir) #xE564 #xE565))))) flg) (cons (- (* (ly:grob-property stm 'thickness) (ly:staff-symbol-line-thickness grob)))