Merge branch 'master' into translation

[lilypond.git] / input / regression / arpeggio-collision.ly

diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 9e13f8bc5e4de43fcf2cd562e5c4e78d76a73baa..5fccbca3a6af6aaf416b3d101905f901e1297249 100644 (file)
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,13 +1,14 @@
-\version "2.7.13"
+\version "2.17.17"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
 }
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
   \context{
     \Staff
     connectArpeggios = ##t
+    \consists "Span_arpeggio_engraver"
   }
 }
 
@@ -17,4 +18,5 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
   <fis'' g d a>\arpeggio
   <fis, g d a>\arpeggio
   <fis'' g d a>\arpeggio
+  << { <e' a>\arpeggio } \\ { <g cis>\arpeggio } >>
 }