X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fdisplay-lily-tests.ly;h=79f64d4e42dda360c064d2469df351ff58e3cea1;hb=3e251ec33b325f3af4adb31df9752422eb2b9f4c;hp=cbbebd6539fa0f9bd6acb0767c7a93e38f8aec97;hpb=ec074a41f03cf4cd3b914daa1359dd6e0fb2012d;p=lilypond.git

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index cbbebd6539..79f64d4e42 100644
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.17.25"
+\version "2.19.40"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
@@ -15,10 +15,10 @@
                                   (char=? (peek-char port) #\]))
                              (read-char port))
                           (display c out))))))
-    `(let* ((parser-clone (ly:parser-clone parser))
+    `(let* ((parser-clone (ly:parser-clone))
             (input-str (string-trim-both ,lily-string))
             (music (ly:parse-string-expression parser-clone input-str))
-            (result-str (string-trim-both (music->lily-string music parser-clone))))
+            (result-str (string-trim-both (music->lily-string music))))
        (cons input-str result-str))))
 
 #(read-hash-extend #\[ parse-lily-and-compute-lily-string) %{ ] %}
@@ -27,7 +27,7 @@
    (make-column-markup (string-split str #\NewLine)))
 
 test =
-#(define-void-function (parser location harmless strings)
+#(define-void-function (harmless strings)
   ((string?) pair?)
   (let ((input (car strings))
 	(output (cdr strings))
@@ -36,7 +36,7 @@ test =
     (if harmless
      (ly:progress "Test unequal: ~a.\nin  = ~a\nout = ~a\n"
       harmless input output)
-     (ly:input-warning location "Test unequal: BUG.\nin  = ~a\nout = ~a\n"
+     (ly:input-warning (*location*) "Test unequal: BUG.\nin  = ~a\nout = ~a\n"
       input output)))))
 
 %%%
@@ -172,7 +172,7 @@ stderr of this run."
 \test ##[ \clef "bass^(15)" #]
 \test ##[ \clef "alto_3" #]
 \test ##[ \time 2/4 #]
-\test ##[ \time #'(3 2) 5/8 #]
+\test ##[ \time 3,2 5/8 #]
 \test ##[ \bar "|." #]
 
 %% staff switches
@@ -188,8 +188,8 @@ stderr of this run."
 %% pure rhythm
 \test ##[ { 4 4 8 \tuplet 3/2 { 8[ 16] } 16 } #]
 
-%% \relative and \tranpose
-\test #"NOT A BUG" ##[ \relative c' { c4 b4 } #]	% RelativeOctaveMusic
+%% \relative and \transpose
+\test #"NOT A BUG" ##[ \relative { c'4 b4 } #]	% RelativeOctaveMusic
 \test #"NOT A BUG" ##[ \transpose c d { c4 d4 } #]	% TransposedMusic
 
 %% Repeats
@@ -226,7 +226,8 @@ stderr of this run."
 \test ##[ \revert StaffGrouper.staff-staff-spacing.basic-distance #]    % nested properties
 
 %% \applyOutput
-\test ##[ \applyOutput #'Foo #(lambda (arg) (list)) #]
+\test ##[ \applyOutput Foo #(lambda (arg) (list)) #]
+\test ##[ \applyOutput Foo.NoteHead #(lambda (arg) (list)) #]
 %% \applyContext
 \test ##[ \applyContext #(lambda (arg) (list)) #]
 
@@ -237,7 +238,11 @@ stderr of this run."
 
 %% \partcombine
 \test ##[ \partcombine { c4 e4 }
-{ d4 f4 } #]						% PartCombineMusic UnrelativableMusic
+{ d4 f4 } #]
+\test ##[ \partcombineUp { c2 e2 }
+{ d2 f2 } #]
+\test ##[ \partcombineDown { c1 e1 }
+{ d1 f1 } #]
 
 %% Cue notes
 \test ##[ \cueDuring #"foo" #1 { c4 d4 } #]