Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 634d3cefd245b0f6af54e1dcef27826ddc0ba925..a1be03b6548e186e7f554132b9f1467b97d0d246 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,7 +1,8 @@
-\version "2.1.28"
+\version "2.12.0"
+\layout { ragged-right = ##t }
 
 \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.
@@ -11,32 +12,29 @@ The last f gets cautionary natural because fis was only in the other voice.
 
 
 
-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 {
-           \set printOctaveNames = ##f
-            \voicea
-            }
-       \context Staff << 
-           #(set-accidental-style 'modern-voice-cautionary)
-           \new Voice \voicea
-           \new Voice \voiceb
-       >>
-       \new NoteNames {
-           \set printOctaveNames = ##f
-           \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
 
-                        }
-    >>
-\paper { raggedright = ##t }
-}
+  }
+>>