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 dc10fa265f04592b1e8b9953633738073bb685ef..36770519815c097802e20863a826a5109e3d0b6b 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -956,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)
@@ -965,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))))