* python/lilylib.py (error_log): use mktemp iso. temp_dir. This

[lilypond.git] / input / regression / accidentals.ly

diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly
index dbd2f02f60ad7ee8d56ecc8cf01b0b7a118cb83a..5914a1c8767994f8b9ec47514a5577776264c531 100644 (file)
--- a/input/regression/accidentals.ly
+++ b/input/regression/accidentals.ly
@@ -1,4 +1,4 @@
-\version "1.5.24.rz2"
+\version "1.7.18"
 
 \header{
 texidoc="
@@ -6,31 +6,66 @@ This shows how accidentals are handled.
 "
 }
 
+#(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 { \key d \major \time 4/4
  d4  dis dis8 dis, d4 | d dis disis8 d, dis4 | d des disis8 dis, d4 | dis deses d dis ~ | dis dis ~ dis8 d, dis4 ~ | \break
  dis dis cis c | c cis cisis cis | c ces cisis c | cis ceses c cis ~ | cis cis ~ cis cis \bar "|."  | \break
 }
 
-\score { \notes \context Staff \transpose c''' {
+\score { \notes
+ <
+  \context Staff \transpose c c'' {
    \mel
-   \property Score.oneMeasureLazy = ##t
-   \property Score.autoAccidentals = #'(same-octave)
-   < s1^"$\\backslash$property Score.autoAccidentals = \\#'(same-octave)" \mel >
-   \property Score.autoAccidentals = #'(lazy-same-octave)
-   < s1^"$\\backslash$property Score.autoAccidentals = \\#'(lazy-same-octave)" \mel >
-   \property Score.autoAccidentals = #'(any-octave)
-   < s1^"$\\backslash$property Score.autoAccidentals = \\#'(any-octave)" \mel >
-   \property Score.autoAccidentals = #'(lazy-any-octave)
-   < s1^"$\\backslash$property Score.autoAccidentals = \\#'(lazy-any-octave)" \mel >
-   \stoneAccidentals
-   < s1^"$\\backslash stoneAccidentals" \mel >
-   \stoneCautionaries
-   < s1^"$\\backslash stoneCautionaries" \mel >
+%   \property Score.oneMeasureLazy = ##t
+   \property Score.autoAccidentals = #'(Staff (same-octave . 0))
+   < s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 0))" \mel >
+   \property Score.autoAccidentals = #'(Staff (same-octave . 1))
+   < s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 1))" \mel >
+   \property Score.autoAccidentals = #'(Staff (any-octave . 0))
+   < s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 0))" \mel >
+   \property Score.autoAccidentals = #'(Staff (any-octave . 1))
+   < s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 1))" \mel >
+   \modernAccidentals
+   < s1^"$\\backslash$modernAccidentals" \mel >
+   \modernCautionaries
+   < s1^"$\\backslash$modernCautionaries" \mel >
    \noResetKey
-   < s1^"$\\backslash noResetKey" \mel >
-  }
-  \paper {
-    indent = 0.0
+   < s1^"$\\backslash$noResetKey" \mel >
+   \forgetAccidentals
+   < s1^"$\\backslash$forgetAccidentals" \mel >
   }
+  \context NoteNames \repeat unfold 9 \apply #no-octaves \mel
+ >
+ \paper {
+  indent = 0.0
+ }
 }