Imported Upstream version 2.16.0

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

diff --git a/input/regression/slur-multiple.ly b/input/regression/slur-multiple.ly
index 7773632238230320957e419932a431a9ee9f643c..1b2bec4d01bedd2e9e7027534c30d4146617f46b 100644 (file)
--- a/input/regression/slur-multiple.ly
+++ b/input/regression/slur-multiple.ly
@@ -1,21 +1,25 @@
-\version "2.14.2"
+\version "2.16.0"
 
 #(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
+  texidoc = "LilyPond does not support multiple concurrent slurs with the 
 parentheses syntax.  In this case, warnings will be given and the nested
 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")
+sp=#(define-event-function (parser location n e) (index? ly:event?)
+     (set! (ly:music-property e 'spanner-id) (format "sp~a" n))
+     e)
 
-\relative c'' {
+\relative c'' { 
   % 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 |
-
+  c4((\sp1( d4)(\sp1( e4) f) |
+  % This will give two overlapping slurs and "unterminated slur" from above
+  d(  d\sp2( e) f\sp2) |
+  
 }