Rename OctavateEight to ClefModifier

[lilypond.git] / scm / define-music-display-methods.scm

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index e5d511675e2a011432890263dee456e9f2673ffb..36770519815c097802e20863a826a5109e3d0b6b 100644 (file)
--- 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)
@@ -951,8 +956,8 @@ Otherwise, return @code{#f}."
                                                                 value ?clef-position
                                                                 symbol 'clefPosition)
                                                          (music 'PropertySet
-                                                                value ?clef-octavation
-                                                                symbol 'clefOctavation)
+                                                                value ?clef-transposition
+                                                                symbol 'clefTransposition)
                                                          (music 'ApplyContext
                                                                 procedure ly:set-middle-C!)))))
     (let ((clef-name (assoc-get (list ?clef-glyph ?clef-position 0)
@@ -960,12 +965,12 @@ Otherwise, return @code{#f}."
       (if clef-name
          (format #f "\\clef \"~a~{~a~a~}\"~a"
                  clef-name
-                 (cond ((= 0 ?clef-octavation)
+                 (cond ((= 0 ?clef-transposition)
                         (list "" ""))
-                       ((> ?clef-octavation 0)
-                        (list "^" (1+ ?clef-octavation)))
+                       ((> ?clef-transposition 0)
+                        (list "^" (1+ ?clef-transposition)))
                        (else
-                        (list "_" (- 1 ?clef-octavation))))
+                        (list "_" (- 1 ?clef-transposition))))
                  (new-line->lily-string))
          #f))))