X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fdisplay-lily-tests.ly;h=7d81a696afaf4b7f401567ddcbad281c9dcfb538;hb=f47d8eced407ca1fa546d8bbc19806b62686a435;hp=516fbb4acbfa469b6c0438d7948c70b245e6b71a;hpb=6b56dcc5d7fd5152d4c8e4fc3e1413fc1d548e61;p=lilypond.git

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 516fbb4acb..7d81a696af 100644
--- 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
@@ -128,7 +124,7 @@ stderr of this run."
 \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 "" ##[ { c4-\harmonic  c^\harmonic  c_\harmonic  } #] 	% HarmonicEvent
+\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\p  c^\ff  c_\sfz  } #] 		% AbsoluteDynamicEvent
@@ -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 } } #] % 
@@ -213,9 +208,9 @@ stderr of this run."
 \test "" ##[ \unset autoBeaming #]
 %% Layout properties
 \test "" ##[ \override Staff . Stem #'thickness = #4.0 #]	% OverrideProperty
-\test "" ##[ \once \override Beam #'thickness = #0.6 #]
+\test "" ##[ \once \override Beam #'beam-thickness = #0.6 #]
 \test "" ##[ \revert Staff . Stem #'thickness #]	% RevertProperty
-\test "" ##[ \revert Beam #'thickness #]
+\test "" ##[ \revert Beam #'beam-thickness #]
 
 %% \applyOutput
 \test "" ##[ \applyOutput #'Foo #(lambda (arg) (list)) #]