X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Farpeggio-collision.ly;h=5fccbca3a6af6aaf416b3d101905f901e1297249;hb=097cec3ca750c11ca1129034de3a1bb630782c0e;hp=5bface2330bc323f4442b7cbaba814d04674c652;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git

diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 5bface2330..5fccbca3a6 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,52 +1,22 @@
-#(ly:set-option 'old-relative)
-\version "1.9.2"
+\version "2.17.17"
 
 \header  {
-texidoc = "Arpeggio stays clear of accidentals and flipped note heads.
-Since Arpeggio engraver is Voice, it does nothing for voice collisions."
+texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
+}
+\layout {
+  ragged-right = ##t
+  \context{
+    \Staff
+    connectArpeggios = ##t
+    \consists "Span_arpeggio_engraver"
+  }
 }
 
-hairyChord = \context Staff \notes\relative c' <
-    \new Voice {
-        \property Voice.Stem \override #'direction = #1
-	 \property Voice.NoteColumn \override #'horizontal-shift = #0
-	 e4\arpeggio
-    }
-    
-    \new Voice {
-	 \property Voice.Stem \override #'direction = #1
-	 \property Voice.NoteColumn \override #'horizontal-shift = #1
-	 cis\arpeggio
-	 }
-    
-    \new Voice {
-    	\property Voice.Stem \override #'direction = #1
-	\property Voice.NoteColumn \override #'horizontal-shift = #2
-	ais\arpeggio
-	}
-    
-    \new Voice {
-	\property Voice.Stem \override #'direction = #-1
-	\property Voice.NoteColumn \override #'horizontal-shift = #-1
-	fis\arpeggio
-	}
->
 
 
-\score{
-    \notes \transpose c c' {
-	<< fis'' g  d a >>\arpeggio
-	<< fis, g  d a >>\arpeggio
-	<< fis'' g  d a >>\arpeggio
-        \hairyChord
-	}
-    \paper {
-        raggedright = ##t
-	\translator{
-	    \StaffContext
-	    connectArpeggios = ##t
-	}
-	}
+\transpose c c' {
+  <fis'' g d a>\arpeggio
+  <fis, g d a>\arpeggio
+  <fis'' g d a>\arpeggio
+  << { <e' a>\arpeggio } \\ { <g cis>\arpeggio } >>
 }
-
-