Merge remote-tracking branch 'origin/translation' into staging

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

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index f0f2cd4da58e441c49c49fd8f99334927015d670..892359dfc2a060ad5279d13405b85000597dc06c 100644 (file)
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,9 +1,9 @@
-\version "2.12.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 definately a problem.
+%% If we're not using 6 systems, there's definitely a problem.
 #(define (assert-system-count smob n)
   (let ((systems (length (ly:spanner-broken-into
                          (ly:grob-original
@@ -13,14 +13,14 @@ forcedLastBreak =  { \break }
        ;;(warn
        (string-append "Got " (number->string systems)
                             " systems (expecting " (number->string n))))))
-            
+
 
 #(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 {
   title = "Solo Cello Suite II"
   piece ="Sarabande"
@@ -51,19 +51,19 @@ 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 } \\
     { d4 a2 } >>
-  <d, a' f'>4.  e'8[ d c] | 
+  <d, a' f'>4.  e'8[ d c] |
   bes[ g'] f[
      e16(f] g[ a bes d,)] |
   cis4.\trill b8[ a g] |
 
-  %% check spacing without accs: 
+  %% check spacing without accs:
   %%   c4.\trill bes8[ a g] |
-  
+
   << { d'8. e16 e4.\trill d16 e |
       f4. d8[ e f] }
     \\
@@ -85,7 +85,7 @@ sarabandeA =  \context Voice  \relative c {
   %% 11
   e'8[ f] c,[ g'] f'[ e] |
   f4 f,2 |
-  << {  a'4 a4.\trill bes8 
+  << {  a'4 a4.\trill bes8
        c bes16 a } \\
     { f8[ es] es4. r8 d4 } >>
 
@@ -93,14 +93,14 @@ sarabandeA =  \context Voice  \relative c {
   bes[ g']
   a,[ fis']
   es'[ d] |
-  
+
   %%16
   < bes d, g, >4.\trill a8[ g f!] |
   e bes a f' g a |
   d, as g es' f g |
   cis,[ bes'] a[ g16 f] e!8[ f16 d] |
   cis8 e16 a a,8. g'16 f8(e) |
-  
+
   %%21
   << { d e16(f) f4. e16(d) |
       e8 f16(g) g4. a16(bes) |
@@ -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,13 +156,13 @@ 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
   line-width = 146.8 \mm
 }
@@ -171,8 +171,10 @@ smallerPaper = \layout {
   ragged-bottom = ##t
   indent = 7. \mm
   line-width =183.5 \mm
-  between-system-space = 25\mm 
-  between-system-padding = 0\mm
+  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
@@ -182,17 +184,14 @@ smallerPaper = \layout {
   \score{
     \sarabandeCelloStaff
     \layout { }
-    
+
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 40 4)
-      }
+    \tempo 4 = 40
     }
 
 
     \header{
-      opus= "" 
+      opus= ""
       piece ="Sarabande" }
   }
 }