Merge master into nested-bookparts

[lilypond.git] / input / mutopia / J.S.Bach / baerenreiter-sarabande.ly

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 38faffd006abd3be973a1e9a36fef0fdcb0ee6f3..731ceff949a35d09cba4d61a613fdbe7017a6626 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.11.61"
 
 forcedLastBreak =  { \break }
 
@@ -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 |
 }
 
@@ -173,6 +173,7 @@ smallerPaper = \layout {
   line-width =183.5 \mm
   between-system-space = 25\mm 
   between-system-padding = 0\mm
+  system-count = 6
 
 %%  annotatespacing = ##t
 }
@@ -181,7 +182,15 @@ smallerPaper = \layout {
   \score{
     \sarabandeCelloStaff
     \layout { }
-    \midi{ \tempo 4 = 40 }
+    
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 40 4)
+      }
+    }
+
+
     \header{
       opus= "" 
       piece ="Sarabande" }