* lily/translator.cc, lily/context.cc:, lily/translator-group.cc:

[lilypond.git] / scm / translation-functions.scm

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index e687c32faef5cd411d8714de847d378f4a3605c2..96a5c7ec27b2c7f1bab4268337b5a3127e3984e8 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -6,13 +6,11 @@
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; metronome marks
-(define-public (format-metronome-markup event context)
-  (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))))  
+(define-public (format-metronome-markup dur count context)
+  (let* ((note-mark (make-smaller-markup
+                    (make-note-by-number-markup (ly:duration-log dur)
+                                                (ly:duration-dot-count dur)
+                                                1))))  
     (make-line-markup
      (list
       (make-general-align-markup Y DOWN note-mark)
@@ -63,7 +61,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (format-bass-figure figure event context)
-  (let* ((fig (ly:music-property event 'figure))
+  (let* ((fig (ly:event-property event 'figure))
         (fig-markup (if (number? figure)
 
                         ;; this is not very elegant, but center-aligning all digits
@@ -74,12 +72,12 @@
                              (lambda (y) (make-translate-scaled-markup (cons -0.7 0) y))
                              identity)
 
-                         (if (eq? #t (ly:music-property event 'diminished))
+                         (if (eq? #t (ly:event-property event 'diminished))
                              (markup #:slashed-digit figure)
                              (markup #:number (number->string figure 10))))
                         #f
                         ))
-        (alt (ly:music-property event 'alteration))
+        (alt (ly:event-property event 'alteration))
         (alt-markup
          (if (number? alt)
              (markup
@@ -89,7 +87,7 @@
               (alteration->text-accidental-markup alt))
              
              #f))
-        (plus-markup (if (eq? #t (ly:music-property event 'augmented))
+        (plus-markup (if (eq? #t (ly:event-property event 'augmented))
                          (markup #:number "+")
                          #f))