Merge commit 'origin' into beamlets2

[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 bfe8bbe1333c312d9a9dc0134ba2e80404533d6f..7012fe762f31d4b4b36668a81551759937194fb4 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.6.0"
+\version "2.12.0"
 
 forcedLastBreak =  { \break }
 
@@ -16,8 +16,7 @@ forcedLastBreak =  { \break }
             
 
 #(define (assert-system-count-override count)
-  (ly:export #{ \override NoteHead
-     #'after-line-breaking-callback
+  (ly:export #{ \override NoteHead #'after-line-breaking
        = #(lambda (smob) (assert-system-count smob $count))
   #}))
 
@@ -127,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 |
 }
 
@@ -165,15 +164,16 @@ smallerPaper = \layout {
   }
   
   indent = 5.6 \mm
-  linewidth = 146.8 \mm
+  line-width = 146.8 \mm
 }
 
 \paper {
-  raggedbottom = ##t
+  ragged-bottom = ##t
   indent = 7. \mm
-  linewidth =183.5 \mm
-  betweensystemspace = 25\mm 
-  betweensystempadding = 0\mm
+  line-width =183.5 \mm
+  between-system-space = 25\mm 
+  between-system-padding = 0\mm
+  system-count = 6
 
 %%  annotatespacing = ##t
 }
@@ -182,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" }