X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftranslation-functions.scm;h=fc7552fc355d4ed4e87520e6848cbd7afb3c1214;hb=c77f097358bffedf4ca31e428edf8df263f77cad;hp=366f44fa3baf095b706501c6a21d045f985b2b85;hpb=17098f34eace028d047ee7f9cd6f81a84e0e7537;p=lilypond.git

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 366f44fa3b..fc7552fc35 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -6,16 +6,40 @@
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; metronome marks
-(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)
-      (make-simple-markup  "=")
-      (make-simple-markup (number->string count))))))
+(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))
+                      (make-smaller-markup
+		       (make-note-by-number-markup (ly:duration-log dur)
+						   (ly:duration-dot-count dur)
+						   1))
+		      #f))
+         (note-markup (if (and note-mark (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 (number->string count))))
+                        #f))
+         (text-markup (if (not (null? text))
+                        (make-bold-markup text)
+                        #f)))
+    (if text-markup
+      (if note-markup
+        (make-line-markup (list text-markup
+          (make-concat-markup (list (make-simple-markup "(")
+                                    note-markup
+                                    (make-simple-markup ")")))))
+        (make-line-markup (list text-markup))
+      )
+      (if note-markup
+        (make-line-markup (list note-markup))
+        #f
+      )
+    )
+  )
+)
 
 (define-public (format-mark-alphabet mark context)
   (make-bold-markup (make-markalphabet-markup (1- mark))))
@@ -72,9 +96,12 @@
 			      (lambda (y) (make-translate-scaled-markup (cons -0.7 0) y))
 			      identity)
 
-			  (if (eq? #t (ly:event-property event 'diminished))
-			      (markup #:slashed-digit figure)
-			      (markup #:number (number->string figure 10))))
+			  (cond
+				((eq? #t (ly:event-property event 'diminished))
+				         (markup #:slashed-digit figure))
+				((eq? #t (ly:event-property event 'augmented-slash))
+				         (markup #:backslashed-digit figure))
+				(else (markup #:number (number->string figure 10)))))
 			 #f
 			 ))
 	 (alt (ly:event-property event 'alteration))