Doc-fr: updates EM and NR

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

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 5d500fdfc0b7fb5ef5fade10cc451606dca2997d..61cebc562525aceb5b24818af1bfecc60262aeea 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,7 +1,8 @@
-\version "1.9.6"
+\version "2.17.6"
+\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 (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' {
-    \stemUp
-    fis2 a2 f4 fis a2
+voicea =  \transpose c c' {
+  \stemUp
+  fis2 a2 f4 fis a2

 }
 }

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

 }
 
 }
 

-\score {
-    <<
-       \notes
-       \new NoteNames \apply #no-octaves \voicea
-       \context Staff << 
-           \modernVoiceCautionaries
-           \new Voice \voicea
-           \new Voice \voiceb
-       >>
-       \new NoteNames \apply #no-octaves \voiceb
-    >>
-}
+<<
+  
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voicea
+  }
+  \context Staff << 
+    \accidentalStyle modern-voice-cautionary
+    \new Voice \voicea
+    \new Voice \voiceb
+  >>
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voiceb
+
+  }
+>>