From: David Kastrup <dak@gnu.org>
Date: Thu, 10 Jan 2013 16:00:48 +0000 (+0100)
Subject: define-music-display-methods.scm: use \tuplet rather than \times for TimeScaledMusic
X-Git-Tag: release/2.17.11-1~7^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6f1f57822ea1fcef007fff4458a31ab0dbd30898;p=lilypond.git

define-music-display-methods.scm: use \tuplet rather than \times for TimeScaledMusic
---

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index e5d511675e..dc10fa265f 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -661,6 +661,10 @@ Otherwise, return #f."
 (define-display-method TimeScaledMusic (times parser)
   (let* ((num (ly:music-property times 'numerator))
 	 (den (ly:music-property times 'denominator))
+         (span (ly:music-property times 'duration #f))
+         ;; need to format before changing time scale
+         (formatted-span
+          (and span (duration->lily-string span #:force-duration #t)))
 	 (scale (/ num den))
 	 (dur (*previous-duration*))
 	 (time-scale (*time-scale*)))
@@ -672,9 +676,10 @@ Otherwise, return #f."
 				      (* (ly:duration-scale dur)
 					 scale)))
 		   (*time-scale* (* time-scale scale)))
-      (format #f "\\times ~a/~a ~a"
-	      num
+      (format #f "\\tuplet ~a/~a ~@[~a ~]~a"
 	      den
+	      num
+              formatted-span
 	      (music->lily-string (ly:music-property times 'element) parser)))))
 
 (define-display-method RelativeOctaveMusic (m parser)