Merge branch 'master' into translation

[lilypond.git] / input / regression / display-lily-tests.ly

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 22eaf893d3c2b8dc0c364aad924b061b04985961..6e7a3ab24c9b418aac64bc0cdb597ff25b7765b4 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -27,16 +27,16 @@
    (make-column-markup (string-split str #\NewLine)))
 
 test =
-#(let ((test-number 0))
-  (define-void-function (parser location result-info strings)
-   ((string? "BUG") pair?)
-   (let ((input (car strings))
-        (output (cdr strings)))
-    (set! test-number (1+ test-number))
-    (if (not (equal? input output))
-     (ly:progress "Test ~a unequal: ~a. \nin  = ~a\nout = ~a\n"
-      test-number
-      result-info
+#(define-void-function (parser location harmless strings)
+  ((string?) pair?)
+  (let ((input (car strings))
+       (output (cdr strings))
+       (result-info (or harmless "BUG")))
+   (if (not (equal? input output))
+    (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"
       input output)))))
 
 %%%
@@ -115,13 +115,13 @@ stderr of this run."
 \test ##[ { c-> c^> c_> } #]
 \test ##[ { c-. c^. c_. } #]
 \test ##[ { c-_ c^_ c__ } #]
-\test ##[ { c-\trill c^\trill c_\trill } #]
+\test ##[ { c\trill c^\trill c_\trill } #]
 \test ##[ { c-1 c^2 c_3 } #]                           % FingerEvent
 \test ##[ { c-"foo" c^"foo" c_"foo" } #]               % TextScriptEvent
 \test ##[ { R1*4-"foo" R^"foo" R_"foo" } #]            % MultiMeasureTextEvent
 \test ##[ { < c\harmonic >4 < c e\harmonic > } #]      % HarmonicEvent
-\test ##[ { c-\glissando c^\glissando c_\glissando } #]        % GlissandoEvent
-\test ##[ { c-\arpeggio c^\arpeggio c_\arpeggio } #]   % ArpeggioEvent
+\test ##[ { c\glissando c^\glissando c_\glissando } #] % GlissandoEvent
+\test ##[ { c\arpeggio c^\arpeggio c_\arpeggio } #]    % ArpeggioEvent
 \test ##[ { c\p c^\ff c_\sfz } #]                      % AbsoluteDynamicEvent
 \test ##[ { c[ c] c^[ c^] c_[ c_] } #]                         % BeamEvent
 \test ##[ { c( c) c^( c^) c_( c_) } #]                         % SlurEvent
@@ -141,8 +141,8 @@ stderr of this run."
 \test ##[ \breathe #]
 \test ##[ { c \[ c \] } #]                     % LigatureEvent
 \test ##[ \~ #]                                                % PesOrFlexaEvent
-\test ##[ { c-\bendAfter #3 } #]    % BendAfterEvent
-\test ##[ < c-\rightHandFinger #1 > #]    % StrokeFingerEvent
+\test ##[ c\bendAfter #3 #]    % BendAfterEvent
+\test ##[ c\rightHandFinger #1 #]    % StrokeFingerEvent
 
 \test ##[ \break #]
 \test ##[ \noBreak #]