Run scripts/auxiliar/update-with-convert-ly.sh

[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 998627b716b3664c835a6e6147326418d1e60084..64075f0fde4271a6848aa9e0b65adbb5e0b2b4b8 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.15.19"
+\version "2.16.0"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
@@ -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)))))
 
 %%%
@@ -70,11 +70,11 @@ stderr of this run."
 \test ##[ \skip 2.*3/4 #]              % SkipMusic
 \test ##[ < c\1 e\3 >4.*3/4-. #]       % EventChord, NoteEvent, StringNumberEvent, ArticulationEvent
 \test ##[ < c-1\4 >8 #]
-\test "NOT A BUG" ##[ { < c e g c' > q8-. } #] % RepeatedChord
+\test ##[ { < c e g c' >4 q8-. } #] % RepeatedChord
 
 %% tags
 \test ##[ { \tag #'foo { c4 d } } #]
-\test ##[ c-\tag #'foo -\tag #'baz -^ -. #]
+\test ##[ c-\tag #'foo -\tag #'baz -^-. #]
 
 %% Graces
 \test ##[ { \grace c8 d2 } #]                          % GraceMusic
@@ -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 #]
@@ -180,6 +180,7 @@ stderr of this run."
 %% Tuplets
 \test ##[ \times 2/3 { c8 d e } #]                             % TimeScaledMusic
 \test ##[ \times 4/6 { c16 d e f g a } #]
+\test ##[ \times 2/3 { c d e \times 2/5 { f e d2 d4 } c } #]
 %}
 %% \relative and \tranpose
 \test #"NOT A BUG" ##[ \relative c' { c b } #] % RelativeOctaveMusic
@@ -190,6 +191,8 @@ stderr of this run."
 \test ##[ \repeat unfold 2 { c d } #]                  % UnfoldedRepeatedMusic
 \test ##[ \repeat percent 2 { c d } #]                 % PercentRepeatedMusic
 \test ##[ \repeat tremolo 4 { c16 d } #]               % TremoloRepeatedMusic
+\test ##[ \repeat tremolo 7 { c''32 b' } #]
+\test ##[ \repeat tremolo 15 { c''16 b' } #]
 \test ##[ \repeat volta 2 { c4 d } \alternative { { c d } { e f } } #]    % 
 
 %% Context creation
@@ -242,6 +245,7 @@ stderr of this run."
 \test ##[ < c \tweak #'transparent ##t e > #]
 \test ##[ < \tweak #'color #'(1.0 0.0 0.0) \tweak #'duration-log #2 c > #]
 \test ##[ c-\tweak #'font-size #3 -> #]
+\test ##[ < \tweak Accidental #'color #'(1.0 0.0 0.0) cis eis g > #]
 
 %% end test.