From: Reinhold Kainhofer Date: Tue, 7 Oct 2008 16:59:24 +0000 (+0200) Subject: Factorize the format-metronome-markup X-Git-Tag: release/2.11.64-1~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f68991986ca3298af5275c7db043ed4b075d45d5;p=lilypond.git Factorize the format-metronome-markup This allows the metronome-markup function to be called from anywhere in the score, e.g. to generate the markup for a (sub)title (header field!) or to generate text markup without changing the midi performance at all. --- diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index 901bff0944..b78bfd6e55 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -7,18 +7,21 @@ ;; metronome marks (define-public (format-metronome-markup text dur count context) - (let* ((hide-note (eq? #t (ly:context-property context 'tempoHideNote))) - (note-mark (if (and (not hide-note) (ly:duration? dur)) + (let* ((hide-note (eq? #t (ly:context-property context 'tempoHideNote)))) + (metronome-markup text dur count hide-note))) + +(define-public (metronome-markup text dur count hide-note) + (let* ((note-mark (if (and (not hide-note) (ly:duration? dur)) (make-smaller-markup (make-note-by-number-markup (ly:duration-log dur) (ly:duration-dot-count dur) 1)) - (make-null-markup))) + #f)) (note-markup (if (and (not hide-note) (number? count) (> count 0) ) (make-concat-markup (list (make-general-align-markup Y DOWN note-mark) (make-simple-markup " ") - (make-simple-markup "=") + (make-simple-markup "=") (make-simple-markup " ") (make-simple-markup (number->string count)))) #f))