* lily/book.cc:

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

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 1f28742fff0a285cc4dec6fbd5e422f2003b134d..21fca2682ab3404167a27690a895f91edf64ec1d 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.4.0"
 
 \header{
 texidoc="
@@ -9,53 +9,34 @@ The last f gets cautionary natural because fis was only in the other voice.
 "
 }
 
-#(define  (lo-octave p)
-  (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)))
 
-    (if (pair? es)
-        (ly:set-mus-property!
-         music 'elements
-         (map no-octaves es)))
-
-    (if (ly:music? e)
-        (ly:set-mus-property!
-         music 'element
-         (no-octaves e)))
-
-    (if (ly:pitch? p)
-        (begin
-          (set! p (lo-octave p))
-          (ly:set-mus-property! music 'pitch p)))
-
-
-    music))
-
-voicea = \notes \transpose c c' {
+voicea =  \transpose c c' {
     \stemUp
     fis2 a2 f4 fis a2
 }
-voiceb = \notes \transpose c c' {
+voiceb =  \transpose c c' {
     \stemDown
     c2 fis2  f4 c   f2
 }
 
 \score {
     <<
-       \notes
-       \new NoteNames \apply #no-octaves \voicea
+       
+       \new NoteNames {
+           \set printOctaveNames = ##f
+            \voicea
+            }
        \context Staff << 
-           \modernVoiceCautionaries
+           #(set-accidental-style 'modern-voice-cautionary)
            \new Voice \voicea
            \new Voice \voiceb
        >>
-       \new NoteNames \apply #no-octaves \voiceb
+       \new NoteNames {
+           \set printOctaveNames = ##f
+           \voiceb
+
+                        }
     >>
-\paper { raggedright = ##t }
+\layout { raggedright = ##t }
 }