* scripts/musedata2ly.py (): idem

[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 c6e1724e4572a5c139014f865bfc8838ec01e849..b73bd54e7e601820f4931af24c285c3c99327078 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,11 +1,25 @@
+\version "1.7.6"
 
-#(set! point-and-click line-column-location)
+% #(ly:set-point-and-click 'line-column)
 
 forcedBreak = \notes { }
 %%forcedBreak = \notes { \break }
 forcedLastBreak = \notes { \break }
 %%forcedLastBreak = \notes { }
 
+%% 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))))))
+    (if (not (equal? n systems))
+       (error
+       ;;(warn
+       (string-append "Got " (number->string systems)
+                            " systems (expecting " (number->string n))))))
+            
+
 \header {
   title = "Solo Cello Suite II"
   piece ="Sarabande"
@@ -35,9 +49,6 @@ half way in measure 13 has been forgotten.
 }
 
 
-\version "1.5.68"
-
-
 sarabandeA =  \context Voice \notes \relative c {
   \property Staff.NoteCollision \set #'merge-differently-dotted = ##t
   < { d8. e16 e4.-\trill d16 e } \\
@@ -52,19 +63,19 @@ sarabandeA =  \context Voice \notes \relative c {
   < { d'8. e16 f4.-\trill d16 e |
       f4. [d8 e f] }
     \\
-    { <a,4 f> a2 <a4. d,4.>  } > |
+    { <<a, f>>4 a2 <<a d,>>4.  } > |
 
   %%7
   g8 bes16()a c()bes a()g d'8 f, |
   <  e4.-\trill
-  \\ <c,4 g'> >
+  \\ <<c, g'>>4 >
   [d8 c bes]
 
   %%9
   < { f'8 g16()a a4. g16()f  |
       g8 a16()bes bes4. c16()d }
     \\
-    { a,4 <bes4. d4. > r8 bes4 <g2 f'2>  }
+    { a,4 <<bes d >>4. r8 bes4 <<g f'>>2  }
   > |
   \forcedBreak
 
@@ -82,7 +93,7 @@ sarabandeA =  \context Voice \notes \relative c {
   \forcedBreak
   
   %%16
-  < bes4.-\trill d, g, > [a8 g f!] |
+  << 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] |
@@ -94,8 +105,8 @@ sarabandeA =  \context Voice \notes \relative c {
       e8 f16()g g4. a16()bes |
       a8 cis16 d d,8 e16 f32 g f8-\trill e16()d } \\
     { bes4 g2 |
-      g4 <bes4. cis,> s8 |
-      <d8 a f> r r g, a4 } >
+      g4 <<bes cis,>>4. s8 |
+      <<d a f>>8 r r g, a4 } >
   |
   \stemUp
   d4 d,16 a'( b cis d e f )g |
@@ -106,23 +117,21 @@ sarabandeA =  \context Voice \notes \relative c {
       b cis d cis d4. e16()f | }
     \\
     { f,4 fis4. s8 |
-      <d4 g,> gis4.   } >
+      <<d g,>>4 gis4.   } >
   \voiceOne
   d16(cis)d f,
   [a,8 e']
   \oneVoice
   [d' cis] |
-  d4 d,,2 |
+  %%  d4 d,,2 |
+  d4
+  \property Thread.NoteHead
+  \override #'after-line-breaking-callback
+  = #(lambda (smob) (assert-system-count smob 6))
+  d,,2 |
 }
 
 
-sarabande =  \context Staff \notes<
-  \apply #voicify-music \sarabandeA
-  
->
-
-\version "1.5.68"
-
 sarabandeCelloGlobal =  \notes{
   \time 3/4
   \key f \major
@@ -138,7 +147,7 @@ sarabandeCelloScripts =  \notes{
 }
 
 sarabandeCelloStaff =  \context Staff <
-  \sarabande
+  \sarabandeA
   \sarabandeCelloGlobal
   \sarabandeCelloScripts
 >
@@ -182,3 +191,4 @@ baerPaper = \paper {
 %%% Local variables:
 %%% LilyPond-indent-level:2
 %%% End:
+%% new-chords-done %%