X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fbaerenreiter-sarabande.ly;h=891a3a595c857676d699d3690dd182e9d34fd001;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=abf0cc0637a04bb70891887deb1688d9f3c8de24;hpb=2055f35c47a045a50a01ff4dba8524322cfc3b48;p=lilypond.git

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index abf0cc0637..891a3a595c 100644
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,6 +1,6 @@
-\version "2.14.0"
+\version "2.19.21"
 
-forcedLastBreak =  { \break }
+forcedLastBreak =  {} %%  { \break } if needed to match original breaks
 
 %% We want this to perfectly match the Bärenreiter spacing.
 %% If we're not using 6 systems, there's definitely a problem.
@@ -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 {
@@ -50,8 +50,8 @@ half way in measure 13 has been forgotten.
 }
 
 
-sarabandeA =  \context Voice  \relative c {
-  \override Staff.NoteCollision  #'merge-differently-dotted = ##t
+sarabandeA =  \context Voice  \relative {
+  \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
@@ -171,11 +171,10 @@ smallerPaper = \layout {
   ragged-bottom = ##t
   indent = 7. \mm
   line-width =183.5 \mm
-  obsolete-between-system-space = 25\mm
-  system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
-  system-system-spacing #'padding = #0
-  score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
-  score-system-spacing #'padding = #0
+  system-system-spacing.basic-distance = 14.22 % 25mm, in staff-spaces
+  system-system-spacing.padding = #0
+  score-system-spacing.basic-distance = #0
+  score-system-spacing.padding = #0
   system-count = 6
 
 %%  annotatespacing = ##t
@@ -187,10 +186,7 @@ smallerPaper = \layout {
     \layout { }
 
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 40 4)
-      }
+    \tempo 4 = 40
     }