From eee677c480c78d58a5215e246575aa94ba2d1897 Mon Sep 17 00:00:00 2001 From: Thomas Morley Date: Sun, 16 Apr 2017 17:11:05 +0200 Subject: [PATCH] Issue 5122 Fix not scaling stem in note-by-number-markup Done by calling text-font-size from layout, which defaults to 11. Then scaling stem-thickness and stem-length by division of text-font-size through 11. This ensures a stem-appearance according to the text-properties of MetronomeMark. --- scm/define-markup-commands.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index fbc7ee5ecb..91b9391fe6 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -3726,6 +3726,10 @@ mensural-flags. Both are supplied for convenience. (let* ((font (ly:paper-get-font layout (cons '((font-encoding . fetaMusic) (font-name . #f)) props))) + ;; default for text-font-size is 11 + ;; hence we use (/ text-font-size 11) later, to ensure proper scaling + ;; of stem-length and thickness + (text-font-size (ly:output-def-lookup layout 'text-font-size 11)) (size-factor (magstep font-size)) (blot (ly:output-def-lookup layout 'blot-diameter)) (head-glyph-name @@ -3749,8 +3753,9 @@ mensural-flags. Both are supplied for convenience. (attach-indices (ly:note-head::stem-attachment font head-glyph-name)) (stem-length (* size-factor (max 3 (- log 1)))) ;; With ancient-flags we want a tighter stem - (stem-thickness (* size-factor (if ancient-flags? 0.1 0.13))) - (stemy (* dir stem-length)) + (stem-thickness + (* size-factor (/ text-font-size 11) (if ancient-flags? 0.1 0.13))) + (stemy (* dir (/ text-font-size 11) stem-length)) (attach-off (cons (interval-index (ly:stencil-extent head-glyph X) (* (sign dir) (car attach-indices))) @@ -3818,7 +3823,6 @@ mensural-flags. Both are supplied for convenience. stem-thickness 0)) (+ stemy flag-style-Y-corr)))))) - ;; If there is a flag on an upstem and the stem is short, move the dots ;; to avoid the flag. 16th notes get a special case because their flags ;; hang lower than any other flags. -- 2.39.2