Fix some bugs in the dynamic engraver and PostScript backend

[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 fb1018520e8188351ff72398db7ac0111baa92bd..38faffd006abd3be973a1e9a36fef0fdcb0ee6f3 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,18 +1,13 @@
-\version "1.9.4"
+\version "2.7.39"
 
-% #(ly:set-point-and-click 'line-column)
-
-forcedBreak = \notes { }
-%%forcedBreak = \notes { \break }
-forcedLastBreak = \notes { \break }
-%%forcedLastBreak = \notes { }
+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
@@ -20,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"
 
@@ -49,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: 
@@ -68,10 +70,10 @@ sarabandeA =  \context Voice \notes \relative c {
     { <a, f>4 a2 <a d,>4.  } >> |
 
   %%7
-  g8 bes16(a) c(bes) a(g) d'8 f, |
+  g'8 bes16(a) c(bes) a(g) d'8 f, |
   <<  e4.\trill
     \\ <c, g'>4 >>
-  d8[ c bes]
+  d'8[ c bes]
 
   %%9
   << { f'8 g16(a) a4. g16(f)  |
@@ -79,10 +81,9 @@ sarabandeA =  \context Voice \notes \relative c {
     \\
     { 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 } \\
@@ -92,7 +93,6 @@ sarabandeA =  \context Voice \notes \relative c {
   bes[ g']
   a,[ fis']
   es'[ d] |
-  \forcedBreak
   
   %%16
   < bes d, g, >4.\trill a8[ g f!] |
@@ -100,7 +100,6 @@ sarabandeA =  \context Voice \notes \relative c {
   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
   
   %%21
   << { d e16(f) f4. e16(d) |
@@ -112,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,22 +120,20 @@ sarabandeA =  \context Voice \notes \relative c {
     { f,4 fis4. s8 |
       <d g,>4 gis4.   } >>
   \voiceOne
-  d16(cis  d) f,
+  d'16(cis  d) f,
   a,8[ e']
   \oneVoice
   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
@@ -145,51 +142,51 @@ 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
 
+%%  annotatespacing = ##t
+}
 
-\score{
-  \sarabandeCelloStaff
-  \paper{
-    \baerPaper
+\book {
+  \score{
+    \sarabandeCelloStaff
+    \layout { }
+    \midi{ \tempo 4 = 40 }
+    \header{
+      opus= "" 
+      piece ="Sarabande" }
   }
-  \midi{ \tempo 4 = 40 }
-  \header{
-    opus= "" 
-    piece ="Sarabande" }
 }
-
 %%% Local variables:
 %%% LilyPond-indent-level:2
 %%% End: