Merge commit 'origin' into beamlets2

[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 516fbb4acbfa469b6c0438d7948c70b245e6b71a..f8e49a1cb371353f9fbfb2312b55e37ece721fd7 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,11 +1,12 @@
-\version "2.11.6"
+\version "2.12.0"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
 %%%
 %%% Testing utilities
 %%%
-
+#(use-modules (scm display-lily))
+#(memoize-clef-names supported-clefs)
 #(define (parse-lily-and-compute-lily-string chr port)
   (let ((lily-string (call-with-output-string
                       (lambda (out)
@@ -39,11 +40,7 @@
          (if result-info
              result-info "BUG")
           input output))
-
-
-     (make-music 'SequentialMusic 'void #t)
-    
-   ))))
+     (make-music 'SequentialMusic 'void #t)))))
          
 test = 
 #(define-music-function (parser location result-info strings) (string? pair?)
@@ -57,7 +54,6 @@ test =
 stderr of this run." 
 }
 
-
 %% Sequential music
 \test "" ##[ { { a b } { c d } } #]            % SequentialMusic
 \test "" ##[ << { a b } { c d } >> #]          % SimultaneousMusic
@@ -137,8 +133,8 @@ stderr of this run."
 \test "" ##[ { c\<  c\!  c^\<  c^\!  c_\<  c_\!  } #]  % CrescendoEvent
 \test "" ##[ { c\>  c\!  c^\>  c^\!  c_\>  c_\!  } #]  % DecrescendoEvent
 \test "" ##[ { c\(  c\)  c^\(  c^\)  c_\(  c_\)  } #]  % PhrasingSlurEvent
-\test "" ##[ { c\sustainDown  c\sustainUp  } #] % SustainEvent
-\test "" ##[ { c\sostenutoDown  c\sostenutoUp  } #] % SostenutoEvent
+\test "" ##[ { c\sustainOn  c\sustainOff  } #] % SustainEvent
+\test "" ##[ { c\sostenutoOn  c\sostenutoOff  } #] % SostenutoEvent
 \test "" ##[ \melisma #]
 \test "" ##[ \melismaEnd #]
 \test "" ##[ { c\startTextSpan  c\stopTextSpan  } #] % TextSpanEvent
@@ -158,7 +154,7 @@ stderr of this run."
 \test "" ##[ \noPageTurn #]
 
 %% Checks
-\test "" ##[ \octave a' #]                             % RelativeOctaveCheck
+\test "" ##[ \octaveCheck a' #]                                % RelativeOctaveCheck
 \test "" ##[ | #]                                      % BarCheck
 
 %% Marks
@@ -191,7 +187,6 @@ stderr of this run."
 %% Repeats
 \test "" ##[ \repeat volta 2 { c d } #]                % VoltaRepeatedMusic
 \test "" ##[ \repeat unfold 2 { c d } #]               % UnfoldedRepeatedMusic
-\test "" ##[ \repeat fold 2 { c d } #]         % FoldedRepeatedMusic
 \test "" ##[ \repeat percent 2 { c d } #]              % PercentRepeatedMusic
 \test "" ##[ \repeat tremolo 4 { c16 d } #]            % TremoloRepeatedMusic
 \test "" ##[ \repeat volta 2 { c4 d } \alternative { { c d } { e f } } #] %