X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Faccidental-octave.ly;h=effdfec520e58c692f5cffe888b53c1fc95c03f1;hb=68dbc841e3401f14b900f6750ebb49b406caf357;hp=5c3bfd727a6e85a4125d8b0bdb5efc296ac177ec;hpb=c81b75a62bd21b85642b76ce364b5016087bce24;p=lilypond.git

diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index 5c3bfd727a..effdfec520 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,83 +1,27 @@
 
-\version "1.7.5"
+\version "2.16.0"
 
 \header {
-texidoc="
-This shows how accidentals in different octaves are handled.
-FIXME: Shorten and docu
-
+  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))
+}
 
 
-\include "paper16.ly"
 
-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
 }
 
-mus = \notes {
-   \mel
-
-%% 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))
-   < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 1))" \mel >
-   \property Score.autoAccidentals = #'(Staff (any-octave . 0))
-   < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 0))" \mel >
-   \property Score.autoAccidentals = #'(Staff (any-octave . 1))
-   < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 1))" \mel >
-   \modernAccidentals
-   < s1^""^""^"$\\backslash$modernAccidentals" \mel >
-   \modernCautionaries
-   < s1^""^""^"$\\backslash$modernCautionaries" \mel >
-   \noResetKey
-   < s1^""^""^"$\\backslash$noResetKey" \mel >
-   \forgetAccidentals
-   < s1^""^""^"$\\backslash$forgetAccidentals" \mel >
-}
-
-
-\score {
-  < \context Staff \mus
-    \context NoteNames \apply #no-octaves \mus
-  >
-  \paper {
-    indent=0.0
-  }
-}
+<< \context Staff \mel
+   \context NoteNames{
+     \set printOctaveNames= ##f
+     \mel
+   }
+ >>