Issue 2696/2: Replace some uses of ly:duration-factor

diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index e093337091d7610af2d36b2bc1e68c9c5bc5476b..2beabeeff7e6756e1e1f2874d7b12ed069397dfb 100644 (file)
--- 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 6e3f79cb5fefdd504a48c643aa188826941041a2..29a264069bf1b988827e4980a85f24338eea3027 100644 (file)
--- 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 d70c2b7d4cb9254fff467dd260786e20b6eb3140..202cad688375bf8dab64daf971a2abd0e661f295 100644 (file)
--- 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<?
    ly:duration?
    ly:error