From e657e4f81ac18b60843b526a1c73f7dac676d92d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 22 Aug 2004 22:58:50 +0000 Subject: [PATCH] (stop_translation_timestep): call typeset_grob(). --- ChangeLog | 5 +++++ lily/metronome-engraver.cc | 3 +-- scm/define-markup-commands.scm | 2 +- scm/translation-functions.scm | 8 +++++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3a828c03f..a028b4d112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-23 Han-Wen Nienhuys + + * lily/metronome-engraver.cc (stop_translation_timestep): call + typeset_grob(). + 2004-08-20 Mats Bengtsson * scripts/lilypond.py (ly_paper_to_latexpaper): Only set the diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 280eeb2031..7d3ab5b722 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -50,7 +50,7 @@ Metronome_mark_engraver::stop_translation_timestep () Grob*mc = unsmob_grob (get_property( "currentMusicalColumn")); text_->set_parent (mc, X_AXIS); text_->set_property ("side-support-elements" , get_property ("stavesFound")); - + typeset_grob (text_); text_ =0; } mark_ev_ = 0; @@ -65,7 +65,6 @@ Metronome_mark_engraver::create_items (Music *rq) text_ = make_item ("MetronomeMark"); announce_grob (text_, rq->self_scm ()); - } diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index b2734495e9..629d00a3d1 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -343,7 +343,7 @@ and/or @code{extra-offset} properties. " (def-markup-command (note-by-number paper props log dot-count dir) (number? number? number?) "Construct a note symbol, with stem. By using fractional values for @var{dir}, you can obtain longer or shorter stems." - + (let* ((font (ly:paper-get-font paper (cons '((font-encoding . music)) props))) (stemlen (max 3 (- log 1))) (headgl (ly:find-glyph-by-name diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index b4888a4ec9..97aaab1485 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -17,18 +17,20 @@ (let* ((dur (ly:music-property event 'tempo-unit)) (count (ly:music-property event 'metronome-count)) + (note-mark (make-smaller-markup (make-note-by-number-markup (ly:duration-log dur) - (ly:duration-dot-count dur) - 1)))) + (ly:duration-dot-count dur) + 1)))) + (make-line-markup (list (make-general-align-markup Y DOWN note-mark) (make-simple-markup "=") (make-simple-markup (number->string count)) - )))) + )))) -- 2.39.5