* lily/rest.cc (polyphonic_offset_callback): new function. Do

[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 df1a257a125bd0202d59d521cc24dbf21ccbcc0e..273ea88be5b8a1a15ace5625d703c8b432a00cfc 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,11 +1,8 @@
-\version "1.7.18"
+\version "2.1.22"
 
 % #(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.
@@ -23,7 +20,7 @@ forcedLastBreak = \notes { \break }
 \header {
   title = "Solo Cello Suite II"
   piece ="Sarabande"
-  composer = "J.S.Bach"
+  composer = "J.S. Bach"
   editor = "August Wenzinger"
   source= "B\\\"arenreiter Urtext"
 
@@ -50,89 +47,88 @@ half way in measure 13 has been forgotten.
 
 
 sarabandeA =  \context Voice \notes \relative c {
-  \property Staff.NoteCollision \set #'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,-)] |
-  cis4.-\trill b8-[ a g] |
+  \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,)] |
+  cis4.\trill b8[ a g] |
 
   %% check spacing without accs: 
-  %%   c4.-\trill bes8-[ a g] |
+  %%   c4.\trill bes8[ a g] |
   
-  < { d'8. e16 e4.-\trill d16 e |
-      f4. d8-[ e f] }
+  << { d'8. e16 e4.\trill d16 e |
+      f4. d8[ e f] }
     \\
-    { <<a, f>>4 a2 <<a d,>>4.  } > |
+    { <a, f>4 a2 <a d,>4.  } >> |
 
   %%7
-  g8 bes16(a-) c(bes-) a(g-) d'8 f, |
-  <  e4.-\trill
-  \\ <<c, g'>>4 >
-  d8-[ c bes]
+  g'8 bes16(a) c(bes) a(g) d'8 f, |
+  <<  e4.\trill
+    \\ <c, g'>4 >>
+  d'8[ 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 <<bes d >>4. r8 bes4 <<g f'>>2  }
-  > |
-  \forcedBreak
+    { a,4 <bes d >4. r8 bes4 <g f'>2  }
+  >> |
 
   %% 11
-  e,8-[ f] c,-[ g'] f'-[ e] |
+  e'8[ f] c,[ g'] f'[ e] |
   f4 f,2 |
-  < {  a'4 a4.-\trill bes8 
+  << {  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] |
-  \forcedBreak
+  fis8.\trill es16 d8 c |
+  bes[ g']
+  a,[ fis']
+  es'[ d] |
   
   %%16
-  << bes d, g, >>4.-\trill 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-) |
-  \forcedBreak
+  cis,[ bes'] a[ g16 f] e!8[ f16 d] |
+  cis8 e16 a a,8. g'16 f8(e) |
   
   %%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 <<bes cis,>>4. s8 |
-      <<d a f>>8 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 |
-      <<d g,>>4 gis4.   } >
+      <d g,>4 gis4.   } >>
   \voiceOne
-  d16(cis  d-) f,
-  a,8-[ e']
+  d'16(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))
+  \override NoteHead
+    #'after-line-breaking-callback
+ = #(lambda (smob) (assert-system-count smob 6))
   d,,2 |
 }
 
 
-sarabandeCelloGlobal =  \notes{
+sarabandeCelloGlobal = \notes{
   \time 3/4
   \key f \major
   \clef bass
@@ -143,14 +139,14 @@ sarabandeCelloGlobal =  \notes{
   }
 }
 
-sarabandeCelloScripts =  \notes{
+sarabandeCelloScripts = \notes{
 }
 
-sarabandeCelloStaff =  \context Staff <
+sarabandeCelloStaff = \context Staff <<
   \sarabandeA
   \sarabandeCelloGlobal
   \sarabandeCelloScripts
->
+>>
 
 % size perversions
 smallerPaper = \paper {
@@ -172,7 +168,7 @@ baerPaper = \paper {
     interscoreline=4.0\mm
     \translator {
             \ScoreContext
-%           System \override #'molecule-callback = #box-grob-molecule
+%           System \override #'print-function = #box-grob-stencil
     }
 }