Use distance to original point rather than size of allowed region for

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

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 3daeea0377cc6be59124cb9b0cacf18d2f010f8d..a1be03b6548e186e7f554132b9f1467b97d0d246 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,7 +1,8 @@
-\version "1.5.68"
+\version "2.12.0"
+\layout { ragged-right = ##t }

 
 \header{
 
 \header{

-texidoc="
+  texidoc="

 This shows how modern cross voice auto cautionary accidentals are handled.
 The first two fisses get accidentals because they belong to different voices.
 The first f gets cautionary natural because of previous measure.
 This shows how modern cross voice auto cautionary accidentals are handled.
 The first two fisses get accidentals because they belong to different voices.
 The first f gets cautionary natural because of previous measure.


@@ -9,52 +10,31 @@ The last f gets cautionary natural because fis was only in the other voice.
 "
 }
 
 "
 }
 

-#(define  (lo-octave p)
-  (let* ((a (pitch-alteration p))
-         (n (pitch-notename p)))
-    (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 (music? e)
-        (ly-set-mus-property!
-         music 'element
-         (no-octaves e)))
-
-    (if (pitch? p)
-        (begin
-          (set! p (lo-octave p))
-          (ly-set-mus-property! music 'pitch p)))
-
-
-    music))
-
-voicea = \notes \transpose c'' {
-    \stemUp
-    fis2 a2 f4 fis a2
+voicea =  \transpose c c' {
+  \stemUp
+  fis2 a2 f4 fis a2

 }
 }

-voiceb = \notes \transpose c'' {
-    \stemDown
-    c2 fis2  f4 c   f2
+voiceb =  \transpose c c' {
+  \stemDown
+  c2 fis2  f4 c   f2

 }
 
 }
 

-\score {
-    <
-       \notes
-       \context NoteNames=namesa \apply #no-octaves \voicea
-       \context Staff < 
-           \modernVoiceCautionaries
-           \context Voice = voicea \voicea
-           \context Voice = voiceb \voiceb
-       >
-       \context NoteNames=namesb \apply #no-octaves \voiceb
-    >
-}
+<<
+  
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voicea
+  }
+  \context Staff << 
+    #(set-accidental-style 'modern-voice-cautionary)
+    \new Voice \voicea
+    \new Voice \voiceb
+  >>
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voiceb
+
+  }
+>>