*** empty log message ***

[lilypond.git] / input / regression / accidental-octave.ly

diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index f9bdb98024a619c1dc22362cd7699fd9f72690c8..3ed18f9309b97b066c7729234875d84a43b28b7a 100644 (file)
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,36 +1,38 @@
-\version "1.5.43.rz1"
+
+\version "1.7.6"
 
 \header {
 texidoc="
 This shows how accidentals in different octaves are handled.
-Fixme: Shorten and docu
+FIXME: Shorten and docu
+
 "
 }
 
 #(define  (lo-octave p)
-  (let* ((a (pitch-alteration p))
-         (n (pitch-notename p)))
-    (make-pitch -1 n a)))
+  (let* ((a (ly:pitch-alteration p))
+         (n (ly:pitch-notename p)))
+    (ly:make-pitch -1 n a)))
 
 #(define (no-octaves music)
-  (let* ((es (ly-get-mus-property music 'elements))
-         (e (ly-get-mus-property music 'element))
-         (p (ly-get-mus-property music 'pitch)))
+  (let* ((es (ly:get-mus-property music 'elements))
+         (e (ly:get-mus-property music 'element))
+         (p (ly:get-mus-property music 'pitch)))
 
     (if (pair? es)
-        (ly-set-mus-property
+        (ly:set-mus-property!
          music 'elements
          (map no-octaves es)))
 
-    (if (music? e)
-        (ly-set-mus-property
+    (if (ly:music? e)
+        (ly:set-mus-property!
          music 'element
          (no-octaves e)))
 
-    (if (pitch? p)
+    (if (ly:pitch? p)
         (begin
           (set! p (lo-octave p))
-          (ly-set-mus-property music 'pitch p)))
+          (ly:set-mus-property! music 'pitch p)))
 
 
     music))
@@ -38,7 +40,7 @@ Fixme: Shorten and docu
 
 \include "paper16.ly"
 
-mel = \notes \transpose c'' {
+mel = \notes \transpose c c' {
   \time 4/4 \key d \major
   gis4 g' g gis' | gis2 g' | g1 | gis | g | gis' | g |
   fis4 f' f fis' | fis2 f' | f1 | fis | f | fis' | f |
@@ -47,7 +49,11 @@ mel = \notes \transpose c'' {
 
 mus = \notes {
    \mel
-   \property Score.oneMeasureLazy = ##t
+
+%% FIXME.
+%   \property Score.oneMeasureLazy = ##t
+
+
    \property Score.autoAccidentals = #'(Staff (same-octave . 0))
    < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 0))" \mel >
    \property Score.autoAccidentals = #'(Staff (same-octave . 1))