Merge branch 'master' of git://git.sv.gnu.org/lilypond

[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 b492940ddf89e2a68cf23748e73299fe7d866dfc..434f76fa83600da06f150f5b2af8765e48fd2fbd 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,12 +1,12 @@
 \version "2.11.6"
-
 #(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)
@@ -40,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?)
@@ -58,21 +54,6 @@ test =
 stderr of this run." 
 }
 
-\layout {
-  raggedright = ##t 
-  indent = 0\cm
-  \context {
-    \Staff
-    \override StaffSymbol #'line-count = #1
-    \remove "Time_signature_engraver"
-    \remove "Clef_engraver"
-  }
-  \context {
-    \Score
-    \remove "Bar_number_engraver"
-  }
-}
-
 %% Sequential music
 \test "" ##[ { { a b } { c d } } #]            % SequentialMusic
 \test "" ##[ << { a b } { c d } >> #]          % SimultaneousMusic
@@ -206,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 } } #] %