resolve merge

[lilypond.git] / input / regression / beam-concave-chord.ly

diff --git a/input/regression/beam-concave-chord.ly b/input/regression/beam-concave-chord.ly
index 14e679083249979eabf39599d8b3f299794a0f7d..5d5aa308263d5310a3dbf0e5d116ca2c39940032 100644 (file)
--- a/input/regression/beam-concave-chord.ly
+++ b/input/regression/beam-concave-chord.ly
@@ -1,7 +1,11 @@
-\version "2.12.0"
-
+\version "2.14.0"
+\header {
+texidoc = "Concave beaming works for chords as well as monophonic
+music.
+"
+}
 
-morgenliedBeam = \relative c'' \new Voice{
+morgenliedBeam = \relative c'' \new Voice {
   \time 3/8
   % morgenlied
   c16 b c e g <e b'> |
@@ -9,11 +13,12 @@ morgenliedBeam = \relative c'' \new Voice{
   c16 b c e g <e b'> |
 }
 
-rachmaninovBeams = \relative \new Voice {
+rachmaninovBeams = \relative c' \new Voice {
   \voiceOne
   \time 4/4
   \key c \minor
-  <c' e c'>8 <g c g'> <c f> <ees, ees'>~ <ees ees'> <c c'> <des des'> <d d'>
+  <c' e c'>8[ <g c g'> <c f> <ees, ees'>] ~
+  <ees ees'>8[ <c c'> <des des'> <d d'>]
 }
 
 horizontalBeams = {
@@ -26,30 +31,32 @@ nonHorizontalBeams = {
 }
 \layout {
   ragged-right = ##t
-  }
+}
 
 % cut & paste from beam-concave.ly
 
 #(define (<> x y) (not (= x  y)))
-mustBeHorizontal = 
-  \override Staff.Beam #'positions = #(ly:make-simple-closure
-                                (ly:make-simple-closure
-                                 (append
-                                  (list chain-grob-member-functions `(,cons 0 0))
-                                  (check-slope-callbacks =))))
-mustNotBeHorizontal = 
-  \override Staff.Beam #'positions = #(ly:make-simple-closure
-                                (ly:make-simple-closure
-                                 (append
-                                  (list chain-grob-member-functions `(,cons 0 0))
-                                  (check-slope-callbacks <>))))
-
+mustBeHorizontal = {
+  \override Staff.Beam #'positions =
+    #(ly:make-simple-closure
+      (ly:make-simple-closure
+       (append
+        (list chain-grob-member-functions `(,cons 0 0))
+        (check-slope-callbacks =))))
+}
+mustNotBeHorizontal = {
+  \override Staff.Beam #'positions =
+    #(ly:make-simple-closure
+      (ly:make-simple-closure
+       (append
+        (list chain-grob-member-functions `(,cons 0 0))
+        (check-slope-callbacks <>))))
+}
 
 \new Voice {
   \mustBeHorizontal
-  r1
+  R1
   \horizontalBeams
   \mustNotBeHorizontal
   \nonHorizontalBeams
 }
-