Merge branch 'master' into translation

[lilypond.git] / input / regression / slur-multiple.ly

diff --git a/input/regression/slur-multiple.ly b/input/regression/slur-multiple.ly
index f73d93a3166d29ce4c2afb5da56b300c57b542f3..007b69773ec293a7d30af9d6043bda472b3fde3b 100644 (file)
--- a/input/regression/slur-multiple.ly
+++ b/input/regression/slur-multiple.ly
@@ -1,8 +1,9 @@
-\version "2.15.5"
+\version "2.19.29"
 
 #(ly:set-option 'warning-as-error #f)
 #(ly:expect-warning (_ "already have slur"))
 #(ly:expect-warning (_ "cannot end slur"))
+#(ly:expect-warning (_ "unterminated slur"))
 
 \header {
   texidoc = "LilyPond does not support multiple concurrent slurs with the 
@@ -11,13 +12,10 @@ slur will not be generated.  However, one can can create a second slur with
 a different spanner-id."
 }
 
-altSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id "alt")
-altSlurEnd = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "alt")
-
-\relative c'' { 
+\relative { 
   % This will give warnings ("Already have slur" and "Cannot end slur")
-  c4(( d4)( e4) f) |
-  % This will give two overlapping slurs:
-  d(  d\altSlur e) f\altSlurEnd |
+  c''4((\=1( d4)(\=1( e4) f) |
+  % This will give two overlapping slurs and "unterminated slur" from above
+  d(  d\=2( e) f\=2) |
   
 }