X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FJ.S.Bach%2Fbaerenreiter-sarabande.ly;h=276f102b2521c87c9f23d5aed4a878e2c2c15609;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=b875d75a033575b911adf4c5d0c20456115958bf;hpb=aeb2de649b6409561db9d4530ef6c1eef56f0445;p=lilypond.git

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index b875d75a03..276f102b25 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,15 +1,13 @@
-\version "1.9.4"
+\version "2.11.38"
 
-% #(ly:set-point-and-click 'line-column)
-
-forcedLastBreak = \notes { \break }
+forcedLastBreak =  { \break }
 
 %% We want this to perfectly match the Baerenreiter spacing.
 %% If we're not using 6 systems, there's definately a problem.
 #(define (assert-system-count smob n)
-  (let ((systems (length (ly:get-broken-into
-			  (ly:get-original
-			   (ly:get-system smob))))))
+  (let ((systems (length (ly:spanner-broken-into
+			  (ly:grob-original
+			   (ly:grob-system smob))))))
     (if (not (equal? n systems))
 	(error
 	;;(warn
@@ -17,10 +15,16 @@ forcedLastBreak = \notes { \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"
-  composer = "J.S. Bach"
+  composer = "Johann Sebastian Bach (1685-1750)"
   editor = "August Wenzinger"
   source= "B\\\"arenreiter Urtext"
 
@@ -46,14 +50,15 @@ half way in measure 13 has been forgotten.
 }
 
 
-sarabandeA =  \context Voice \notes \relative c {
-  \property Staff.NoteCollision \set #'merge-differently-dotted = ##t
+sarabandeA =  \context Voice  \relative c {
+  \override Staff.NoteCollision  #'merge-differently-dotted = ##t
 
   
   << { d8. e16 e4.\trill d16 e } \\
     { d4 a2 } >>
-  <d, a' f'>4.  e'8[ d c] |
-  bes[ g'] f[ e16(f] g[ a bes d,)] |
+  <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: 
@@ -106,7 +111,7 @@ sarabandeA =  \context Voice \notes \relative c {
   |
   \stemUp
   d4 d,16 a'( b cis d e f g) |
-  \stemBoth
+  \stemNeutral
   \forcedLastBreak
   %%25
   << { a16(b c b) c4. b16(a) |
@@ -121,16 +126,14 @@ sarabandeA =  \context Voice \notes \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-  \property Thread.NoteHead
-  \override #'after-line-breaking-callback
-  = #(lambda (smob) (assert-system-count smob 6))
+%  #(assert-system-count-override 6)
   d,,2 |
 }
 
 
-sarabandeCelloGlobal =  \notes{
+sarabandeCelloGlobal = {
   \time 3/4
-  \key f \major
+  \key d \minor
   \clef bass
   \repeat "volta" 2 {
     s2.*12
@@ -139,51 +142,60 @@ sarabandeCelloGlobal =  \notes{
   }
 }
 
-sarabandeCelloScripts =  \notes{
+sarabandeCelloScripts = {
 }
 
-sarabandeCelloStaff =  \context Staff <<
+sarabandeCelloStaff = \context Staff <<
   \sarabandeA
   \sarabandeCelloGlobal
   \sarabandeCelloScripts
 >>
 
-% size perversions
-smallerPaper = \paper {
-    \translator { \StaffContext
-		  fontSize = #-1
-		  StaffSymbol \override  #'staff-space = #0.8
-		  }
-    \translator { \ScoreContext
-		   SpacingSpanner \override #'spacing-increment = #0.96
-		}
-	
-    indent = 5.6 \mm
-    linewidth = 146.8 \mm
+%% 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
+  line-width = 146.8 \mm
 }
 
-baerPaper = \paper {
-    indent = 7. \mm
-    linewidth =183.5 \mm
-    interscoreline=4.0\mm
-    \translator {
-	     \ScoreContext
-%	     System \override #'molecule-callback = #box-grob-molecule
-    }
+\paper {
+  ragged-bottom = ##t
+  indent = 7. \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 {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 40 4)
+      }
+    }
 
-\score{
-  \sarabandeCelloStaff
-  \paper{
-    \baerPaper
+
+    \header{
+      opus= "" 
+      piece ="Sarabande" }
   }
-  \midi{ \tempo 4 = 40 }
-  \header{
-    opus= "" 
-    piece ="Sarabande" }
 }
-
 %%% Local variables:
 %%% LilyPond-indent-level:2
 %%% End: