Imported Upstream version 2.16.0

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

diff --git a/input/regression/phrasing-slur-multiple.ly b/input/regression/phrasing-slur-multiple.ly
index fb7b499058b2b4b940ea6015d2813bbe1479731c..dbef390cb52aeabe629d40742cc04fbb35b40747 100644 (file)
--- a/input/regression/phrasing-slur-multiple.ly
+++ b/input/regression/phrasing-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 phrasing slur"))
+#(ly:expect-warning (_ "cannot end phrasing slur"))
+#(ly:expect-warning (_ "unterminated phrasing slur"))
 
 \header {
-  texidoc = "LilyPond does not support multiple concurrent phrasing slurs with the
+  texidoc = "LilyPond does not support multiple concurrent phrasing 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."
 }
 
-altPhSlur = #(make-music 'PhrasingSlurEvent 'span-direction START 'spanner-id "alt")
-altPhSlurEnd = #(make-music 'PhrasingSlurEvent '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 phrasing slur" and "Cannot end phrasing slur")
-  c4\(\( d4\)\( e4\) f\) |
-  % This will give two overlapping slurs:
-  d\(  d\altPhSlur e\) f\altPhSlurEnd |
-
+  c4\(\(\sp1\( d4\)\(\sp1\( e4\) f\) |
+  % This will give two overlapping slurs and "unterminated phrasing slur" from above
+  d\(  d\sp2\( e\) f\sp2\) |
+  
 }