Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index c9ec7cd175a99486bff27b33dd27e3f7e17759bc..c95c6111f381fb315ceb402879774ac8fea073b6 100644 (file)
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,52 +1,20 @@
-#(ly:set-option 'old-relative)
-\version "1.9.0"
+\version "2.11.51"
 
 \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
+  }
 }
 
-hairyChord = \context Staff \notes\relative c' <
-    \context Voice=one {
-        \property Voice.Stem \override #'direction = #1
-        \property Voice.NoteColumn \override #'horizontal-shift = #0
-        e4-\arpeggio
-    }
-    
-    \context Voice=two {
-        \property Voice.Stem \override #'direction = #1
-        \property Voice.NoteColumn \override #'horizontal-shift = #1
-        cis-\arpeggio
-        }
-    
-    \context Voice=three {
-       \property Voice.Stem \override #'direction = #1
-       \property Voice.NoteColumn \override #'horizontal-shift = #2
-       ais-\arpeggio
-       }
-    
-    \context Voice=four {
-       \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
 }
-
-