Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/input/no-notation/display-lily-tests.ly b/input/no-notation/display-lily-tests.ly
index c0372f243d82545ccb50886f0d7a6efabd5eb346..8c99abf8352fb486e92c0decb9c743a485430b3c 100644 (file)
--- a/input/no-notation/display-lily-tests.ly
+++ b/input/no-notation/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.7.2"
+\version "2.9.5"
 
 #(use-modules (srfi srfi-13)
               (ice-9 format))
@@ -34,14 +34,7 @@
 #(define (lily-string->markup str)
    (make-column-markup (string-split str #\NewLine)))
 
-initTest = #(def-music-function (parser location) ()
-             ;; Before using display-lily-music, it must be 
-             ;; inited using display-lily-init
-             (display-lily-init parser)
-             (set! test-number 0)
-             (make-music 'SequentialMusic))
-
-test = #(def-music-function (parser location result-info strings) (string? pair?)
+test = #(define-music-function (parser location result-info strings) (string? pair?)
          (display-lily-init parser)
           (let ((input (car strings))
                 (output (cdr strings)))
@@ -51,9 +44,8 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
                 (make-music 'SequentialMusic
                             'elements
                             (list (make-music 'EventChord
-                                   'elements (list (make-music 'BreakEvent
-                                                    'page-penalty 0
-                                                    'penalty -10001)))
+                                   'elements (list (make-music 'LineBreakEvent
+                                                    'break-permission 'force)))
                                   (make-music 'EventChord
                                    'elements (list (make-music 'SkipEvent
                                                     'duration (ly:make-duration 0 0 1 1))
@@ -82,7 +74,6 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   \context {
     \Staff
     \override StaffSymbol #'line-count = #1
-    %\remove "Staff_symbol_engraver"
     \remove "Time_signature_engraver"
     \remove "Clef_engraver"
   }
@@ -92,7 +83,7 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   }
 }
 {
-  \initTest
+  \fatText
   %% Sequential music
   \test #"" ##[ { { a b } { c d } } #]                 % SequentialMusic
   \test #"" ##[ << { a b } { c d } >> #]               % SimultaneousMusic
@@ -118,7 +109,7 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
 
   %% tags
   \test #"" ##[ { \tag #'foo { c4 d } } #]
-  \test #"" ##[ c-\tag #'(foo baz) -^ -. #]
+  \test #"" ##[ c-\tag #'foo -\tag #'baz -^ -. #]
 
   %% Graces
   \test #"" ##[ { \grace c8 d2 } #]                    % GraceMusic
@@ -142,8 +133,6 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   \test #"" ##[ \lyricsto "foo" { bla bla } #]         % LyricCombineMusic
   \test #"" ##[ { { c d }
   \addlyrics { bla bla } } #]
-  \test #"" ##[ \oldaddlyrics { c d }
-\lyricmode { bla bla } #]                              % OldLyricCombineMusic
 
   %% Drums
   \test #"" ##[ \drums { hihat } #]
@@ -187,6 +176,11 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   \test #"" ##[ \~ #]                                  % PesOrFlexaEvent
 
   \test #"" ##[ \break #]
+  \test #"" ##[ \noBreak #]
+  \test #"" ##[ \pageBreak #]
+  \test #"" ##[ \noPageBreak #]
+  \test #"" ##[ \pageTurn #]
+  \test #"" ##[ \noPageTurn #]
 
   %% Checks
   \test #"" ##[ \octave a' #]                          % RelativeOctaveCheck
@@ -229,6 +223,7 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
 
   %% Context creation
   \test #"" ##[ \new Staff { c d } #]                  % ContextSpeccedMusic
+  \test #"" ##[ \new Staff = "up" { c d } #]                   % ContextSpeccedMusic
   \test #"" ##[ \context Staff { c d } #]
   \test #"" ##[ \context Staff = "up" { c d } #]
   \test #"" ##[
@@ -247,9 +242,12 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   \test #"" ##[ \revert Staff . Stem #'thickness #]    % RevertProperty
   \test #"" ##[ \revert Beam #'thickness #]
 
-  %% \partial
-
+  %% \applyOutput
+  \test #"" ##[ \applyOutput #'Foo #(lambda (arg) (list)) #]
+  %% \applyContext
+  \test #"" ##[ \applyContext #(lambda (arg) (list)) #]
 
+  %% \partial
   \test #"" ##[ \partial 2 #]
   \test #"" ##[ \partial 8. #]
   \test #"TODO? exotic durations in \\partial" ##[ \partial 4*2/3 #]
@@ -261,5 +259,6 @@ test = #(def-music-function (parser location result-info strings) (string? pair?
   %% Cue notes
   \test #"" ##[ \cueDuring #"foo" #1 { c d } #]
   \test #"" ##[ \quoteDuring #"foo" { c d } #]
+
 }