Merge commit 'ce4b499'

[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 5957c0d72bb9e5ba784c8829503848ab0cf4649b..276f102b2521c87c9f23d5aed4a878e2c2c15609 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.5.13"
+\version "2.11.38"
 
 forcedLastBreak =  { \break }
 
@@ -15,6 +15,12 @@ forcedLastBreak =  { \break }
                             " 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))
+  #}))
+
+  
 \header {
   title = "Solo Cello Suite II"
   piece ="Sarabande"
@@ -50,7 +56,7 @@ sarabandeA =  \context Voice  \relative c {
   
   << { 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] |
@@ -120,9 +126,7 @@ sarabandeA =  \context Voice  \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-  \override NoteHead
-    #'after-line-breaking-callback
- = #(lambda (smob) (assert-system-count smob 6))
+%  #(assert-system-count-override 6)
   d,,2 |
 }
 
@@ -147,33 +151,46 @@ sarabandeCelloStaff = \context Staff <<
   \sarabandeCelloScripts
 >>
 
-% size perversions
+%% size perversions
 smallerPaper = \layout {
-    \context { \Staff
-                 fontSize = #-1
-                 \override StaffSymbol  #'staff-space = #0.8
-                 }
-    \context { \Score
-                  \override SpacingSpanner #'spacing-increment = #0.96
-               }
-       
-    indent = 5.6 \mm
-    linewidth = 146.8 \mm
+  \context {
+    \Staff
+    fontSize = #-1
+    \override StaffSymbol  #'staff-space = #0.8
+  }
+  \context {
+    \Score
+    \override SpacingSpanner #'spacing-increment = #0.96
+  }
+  
+  indent = 5.6 \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
 }
 
 \book {
   \score{
     \sarabandeCelloStaff
     \layout { }
-    \midi{ \tempo 4 = 40 }
+    
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 40 4)
+      }
+    }
+
+
     \header{
       opus= "" 
       piece ="Sarabande" }