* buildscripts/mf-to-table.py (base): break table every three

[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 e484d44f748fcb3d148c61f13dda0f357a3ee1db..df1a257a125bd0202d59d521cc24dbf21ccbcc0e 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,5 +1,6 @@
+\version "1.7.18"
 
-#(set! point-and-click line-column-location)
+% #(ly:set-point-and-click 'line-column)
 
 forcedBreak = \notes { }
 %%forcedBreak = \notes { \break }
@@ -9,13 +10,12 @@ forcedLastBreak = \notes { \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 (get-broken-into
-                         (get-original
-                          (get-line smob))))))
+  (let ((systems (length (ly:get-broken-into
+                         (ly:get-original
+                          (ly:get-system smob))))))
     (if (not (equal? n systems))
-       ;; Can't use error yet, as we know that we're not using 6...
-       ;;(error
-       (warn
+       (error
+       ;;(warn
        (string-append "Got " (number->string systems)
                             " systems (expecting " (number->string n))))))
             
@@ -49,99 +49,89 @@ 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 } \\
     { d4 a2 } >
-  f4.  [e8 d c] |
-  [bes g'] [f e16(f] [g a bes)d,] |
-  cis4.-\trill [b8 a g] |
+  <<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: 
-  %%   c4.-\trill [bes8 a g] |
+  %%   c4.-\trill bes8-[ a g] |
   
-  < { d'8. e16 f4.-\trill d16 e |
-      f4. [d8 e f] }
+  < { d'8. e16 e4.-\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, |
+  g8 bes16(a-) c(bes-) a(g-) d'8 f, |
   <  e4.-\trill
-  \\ <c,4 g'> >
-  [d8 c bes]
+  \\ <<c, g'>>4 >
+  d8-[ c bes]
 
   %%9
-  < { f'8 g16()a a4. g16()f  |
-      g8 a16()bes bes4. c16()d }
+  < { 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
 
   %% 11
-  [e,8 f] [c, g'] [f' e] |
+  e,8-[ f] c,-[ g'] f'-[ e] |
   f4 f,2 |
   < {  a'4 a4.-\trill bes8 
        c bes16 a } \\
-    { [f8 es] es4. r8 d4 } >
+    { f8-[ es] es4. r8 d4 } >
 
   fis8.-\trill es16 d8 c |
-  [bes g']
-  [a, fis']
-  [es' d] |
+  bes-[ g']
+  a,-[ fis']
+  es'-[ d] |
   \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] |
-  cis8 e16 a a,8. g'16 f8()e |
+  cis,-[ bes'] a-[ g16 f] e!8-[ f16 d] |
+  cis8 e16 a a,8. g'16 f8(e-) |
   \forcedBreak
   
   %%21
-  < { d e16()f f4. e16()d |
-      e8 f16()g g4. a16()bes |
-      a8 cis16 d d,8 e16 f32 g f8-\trill e16()d } \\
+  < { d e16(f-) f4. e16(d-) |
+      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 |
+  d4 d,16 a'( b cis d e f g-) |
   \stemBoth
   \forcedLastBreak
   %%25
-  < { a16(b c)b c4. b16()a |
-      b cis d cis d4. e16()f | }
+  < { a16(b c b-) c4. b16(a-) |
+      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']
+  d16(cis  d-) f,
+  a,8-[ e']
   \oneVoice
-  [d' cis] |
+  d'-[ cis] |
   %%  d4 d,,2 |
   d4
   \property Thread.NoteHead
   \override #'after-line-breaking-callback
-  = #(lambda (smob) (assert-system-count smob 6.1))
+  = #(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
@@ -157,7 +147,7 @@ sarabandeCelloScripts =  \notes{
 }
 
 sarabandeCelloStaff =  \context Staff <
-  \sarabande
+  \sarabandeA
   \sarabandeCelloGlobal
   \sarabandeCelloScripts
 >
@@ -201,3 +191,4 @@ baerPaper = \paper {
 %%% Local variables:
 %%% LilyPond-indent-level:2
 %%% End:
+