resolve merge

[lilypond.git] / input / regression / beam-collision-voice-only.ly

diff --git a/input/regression/beam-collision-voice-only.ly b/input/regression/beam-collision-voice-only.ly
new file mode 100644 (file)
index 0000000..82b5e97
--- /dev/null
+++ b/input/regression/beam-collision-voice-only.ly
@@ -0,0 +1,14 @@
+\version "2.14.0"
+\header {
+  texidoc = "Beam collision can be tweaked to only apply to the grobs
+within the beam's original voice."
+}
+
+\relative c' {
+  \time 5/4
+  << { c8[ s c ] } \\ { s8 c' s8 } >>
+  c,[ des' ]
+  \override Staff . Beam #'collision-voice-only = ##t
+  << { c,8[ s c ] } \\ { s8 c' s8 } >>
+  c,[ des'! ]
+}