X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Faccidental-octave.ly;h=da4c1e195a92dc66a8d2f93d9c7bea2d7e0acd84;hb=c633bea462ad673cf59f5288b87027c7519c4d4f;hp=eda701480220f30385771a00d934bf5d0e551e14;hpb=e7b7a0604ed42dd6de615434031686bbfcdf72f5;p=lilypond.git

diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index eda7014802..da4c1e195a 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,55 +1,27 @@
 
-\version "2.1.25"
+\version "2.14.0"
 
 \header {
-texidoc="
-This shows how accidentals in different octaves are handled.
-(DOCME)
+  texidoc="
+This shows how accidentals in different octaves are handled. The note names 
+are also automatically printed but the octavation has been dropped out.
 "
 
 
 }
 
-#(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))
-
-
-
-mel = \notes \transpose c c' {
+mel =  \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 |
   \bar "|." \break
 }
 
-\score {
-  << \context Staff \mel
-     \context NoteNames \apply #no-octaves \mel
-  >>
-}
-
+<< \context Staff \mel
+   \context NoteNames{
+     \set printOctaveNames= ##f
+     \mel
+   }
+ >>