]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3349: missing duration in \displayLilyMusic after a triplet
authorDavid Kastrup <dak@gnu.org>
Sat, 4 May 2013 13:24:24 +0000 (15:24 +0200)
committerDavid Kastrup <dak@gnu.org>
Mon, 13 May 2013 07:16:41 +0000 (09:16 +0200)
scm/define-music-display-methods.scm

index 36770519815c097802e20863a826a5109e3d0b6b..82e227c8f59b739afb41c187631972cc86b13c79 100644 (file)
@@ -666,21 +666,18 @@ Otherwise, return #f."
          (formatted-span
           (and span (duration->lily-string span #:force-duration #t)))
         (scale (/ num den))
-        (dur (*previous-duration*))
         (time-scale (*time-scale*)))
-
-    (parameterize ((*force-line-break* #f)
-                  (*previous-duration*
-                   (ly:make-duration (ly:duration-log dur)
-                                     (ly:duration-dot-count dur)
-                                     (* (ly:duration-scale dur)
-                                        scale)))
-                  (*time-scale* (* time-scale scale)))
-      (format #f "\\tuplet ~a/~a ~@[~a ~]~a"
-             den
-             num
-              formatted-span
-             (music->lily-string (ly:music-property times 'element) parser)))))
+    (*previous-duration* #f)
+    (let ((result
+           (parameterize ((*force-line-break* #f)
+                          (*time-scale* (* time-scale scale)))
+             (format #f "\\tuplet ~a/~a ~@[~a ~]~a"
+                     den
+                     num
+                     formatted-span
+                     (music->lily-string (ly:music-property times 'element) parser)))))
+      (*previous-duration* #f)
+      result)))
 
 (define-display-method RelativeOctaveMusic (m parser)
   (music->lily-string (ly:music-property m 'element) parser))