X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fbaerenreiter-sarabande.ly;h=892359dfc2a060ad5279d13405b85000597dc06c;hb=643daee48f829bcfa8e769a4518cd8cb788a3724;hp=5c5af19cedb3be043633c13cd23c8a6f319c5534;hpb=522f419e3ed3e09ecf834bbb5315ac1777ab13e0;p=lilypond.git

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index 5c5af19ced..892359dfc2 100644
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,6 +1,6 @@
-\version "2.16.0"
+\version "2.17.6"
 
-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,7 +16,7 @@ forcedLastBreak =  { \break }
 
 
 #(define (assert-system-count-override count)
-  #{ \override NoteHead #'after-line-breaking
+  #{ \override NoteHead.after-line-breaking
        = #(lambda (smob) (assert-system-count smob count))
   #})
 
@@ -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 } \\
@@ -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,10 +171,9 @@ 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 #'basic-distance = 14.22 % 25mm, in staff-spaces
   system-system-spacing #'padding = #0
-  score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+  score-system-spacing #'basic-distance = #0
   score-system-spacing #'padding = #0
   system-count = 6