From 87cfce8a22ad423dfd4933dbcaa28531d07e6a54 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 3 Oct 2015 08:02:37 +0200 Subject: [PATCH] Issue 4626/2: Make some regtests use \= instead of their own definitions --- input/regression/phrasing-slur-multiple.ly | 10 +++------- input/regression/slur-multiple.ly | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/input/regression/phrasing-slur-multiple.ly b/input/regression/phrasing-slur-multiple.ly index 08487af5d9..adf8221845 100644 --- a/input/regression/phrasing-slur-multiple.ly +++ b/input/regression/phrasing-slur-multiple.ly @@ -1,4 +1,4 @@ -\version "2.19.22" +\version "2.19.29" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (_ "already have phrasing slur")) @@ -12,14 +12,10 @@ slur will not be generated. However, one can can create a second slur with a different spanner-id." } -sp=#(define-event-function (n e) (index? ly:event?) - (set! (ly:music-property e 'spanner-id) (format "sp~a" n)) - e) - \relative { % This will give warnings ("Already have phrasing slur" and "Cannot end phrasing slur") - c''4\(\(\sp1\( d4\)\(\sp1\( e4\) f\) | + c''4\(\(\=1\( d4\)\(\=1\( e4\) f\) | % This will give two overlapping slurs and "unterminated phrasing slur" from above - d\( d\sp2\( e\) f\sp2\) | + d\( d\=2\( e\) f\=2\) | } diff --git a/input/regression/slur-multiple.ly b/input/regression/slur-multiple.ly index a5e8b38c60..007b69773e 100644 --- a/input/regression/slur-multiple.ly +++ b/input/regression/slur-multiple.ly @@ -1,4 +1,4 @@ -\version "2.19.22" +\version "2.19.29" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (_ "already have slur")) @@ -12,14 +12,10 @@ slur will not be generated. However, one can can create a second slur with a different spanner-id." } -sp=#(define-event-function (n e) (index? ly:event?) - (set! (ly:music-property e 'spanner-id) (format "sp~a" n)) - e) - \relative { % This will give warnings ("Already have slur" and "Cannot end slur") - c''4((\sp1( d4)(\sp1( e4) f) | + c''4((\=1( d4)(\=1( e4) f) | % This will give two overlapping slurs and "unterminated slur" from above - d( d\sp2( e) f\sp2) | + d( d\=2( e) f\=2) | } -- 2.39.2