page-layout: skip spacing spec for empty lines; issue 1669

[lilypond.git] / input / regression / baerenreiter-sarabande.ly

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index 4d63357f2ea29bc26a7ca958aecf15d51dddf37c..426bbf4b180e21be52f415b9e271d3d101341038 100644 (file)
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.13.46"
+\version "2.17.6"
 
 forcedLastBreak =  { \break }
 
@@ -16,9 +16,9 @@ forcedLastBreak =  { \break }
 
 
 #(define (assert-system-count-override count)
-  (ly:export #{ \override NoteHead #'after-line-breaking
-       = #(lambda (smob) (assert-system-count smob $count))
-  #}))
+  #{ \override NoteHead.after-line-breaking
+       = #(lambda (smob) (assert-system-count smob count))
+  #})
 
 
 \header {
@@ -51,7 +51,7 @@ half way in measure 13 has been forgotten.
 
 
 sarabandeA =  \context Voice  \relative c {
-  \override Staff.NoteCollision  #'merge-differently-dotted = ##t
+  \override Staff.NoteCollision.merge-differently-dotted = ##t
 
 
   << { d8. e16 e4.\trill d16 e } \\
@@ -126,7 +126,7 @@ sarabandeA =  \context Voice  \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-%  #(assert-system-count-override 6)
+%  $(assert-system-count-override 6)
   d,,2 |
 }
 
@@ -156,11 +156,11 @@ smallerPaper = \layout {
   \context {
     \Staff
     fontSize = #-1
-    \override StaffSymbol  #'staff-space = #0.8
+    \override StaffSymbol.staff-space = #0.8
   }
   \context {
     \Score
-    \override SpacingSpanner #'spacing-increment = #0.96
+    \override SpacingSpanner.spacing-increment = #0.96
   }
 
   indent = 5.6 \mm
@@ -187,10 +187,7 @@ smallerPaper = \layout {
     \layout { }
 
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 40 4)
-      }
+    \tempo 4 = 40
     }