From 0b8e614bfdf62f25556a37392ff4abe2d0319683 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 25 Jul 2012 17:30:52 +0200 Subject: [PATCH] Issue 2696/2: Replace some uses of ly:duration-factor --- scm/define-event-classes.scm | 3 +-- scm/music-functions.scm | 8 +++----- scm/safe-lily.scm | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm index e093337091..2beabeeff7 100644 --- a/scm/define-event-classes.scm +++ b/scm/define-event-classes.scm @@ -146,8 +146,7 @@ (list 'unquote `(ly:make-duration ,(ly:duration-log e) ,(ly:duration-dot-count e) - ,(car (ly:duration-factor e)) - ,(cdr (ly:duration-factor e))))) + ,(ly:duration-scale)))) ((ly:pitch? e) (list 'unquote `(ly:make-pitch ,(ly:pitch-octave e) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 6e3f79cb5f..29a264069b 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -180,8 +180,7 @@ equivalent to @var{obj}, that is, for a music expression, a (ly:duration? obj) `(ly:make-duration ,(ly:duration-log obj) ,(ly:duration-dot-count obj) - ,(car (ly:duration-factor obj)) - ,(cdr (ly:duration-factor obj)))) + ,(ly:duration-scale obj))) (;; note pitch (ly:pitch? obj) `(ly:make-pitch ,(ly:pitch-octave obj) @@ -237,12 +236,11 @@ which often can be read back in order to generate an equivalent expression." The number of dots in the shifted music may not be less than zero." (let ((d (ly:music-property music 'duration))) (if (ly:duration? d) - (let* ((cp (ly:duration-factor d)) + (let* ((cp (ly:duration-scale d)) (nd (ly:make-duration (+ shift (ly:duration-log d)) (max 0 (+ dot (ly:duration-dot-count d))) - (car cp) - (cdr cp)))) + cp))) (set! (ly:music-property music 'duration) nd))) music)) diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm index d70c2b7d4c..202cad6883 100644 --- a/scm/safe-lily.scm +++ b/scm/safe-lily.scm @@ -41,6 +41,7 @@ ly:duration-dot-count ly:duration-factor ly:duration-log + ly:duration-scale ly:duration