Doc-hu: Fundamental concepts: nitpicks

[lilypond.git] / input / regression / baerenreiter-sarabande.ly

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index 0e42c30e38354d4ccab92a83759a943ce195c957..f0f2cd4da58e441c49c49fd8f99334927015d670 100644 (file)
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,10 +1,8 @@
-\version "2.3.4"
-
-% #(ly:set-point-and-click 'line-column)
+\version "2.12.0"
 
 forcedLastBreak =  { \break }
 
-%% We want this to perfectly match the Baerenreiter spacing.
+%% We want this to perfectly match the Bärenreiter spacing.
 %% If we're not using 6 systems, there's definately a problem.
 #(define (assert-system-count smob n)
   (let ((systems (length (ly:spanner-broken-into
@@ -17,14 +15,20 @@ forcedLastBreak =  { \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"
+  source= "Bärenreiter Urtext"
 
-  texidoc = "The B\\\"arenreiter edition of the Cello Suites is the
+  texidoc = "The Bärenreiter edition of the Cello Suites is the
 most beautifully typeset piece of music in our collection of music (we
 both own one. It is also lovely on French Horn). This piece does not
 include articulation, but it does follows the same beaming and
@@ -35,11 +39,11 @@ As of lilypond 1.5.42, the spacing and beam quanting is almost
 identical.
 
 There are two tweaks in this file: a line-break was forced before
-measure 25, we get back the linebreaking of Baerenreiter.  The stem
+measure 25, we get back the linebreaking of Bärenreiter.  The stem
 direction is forced in measure 24. The last beam of that measure is up
-in Baerenreiter because of context. We don't detect that yet.
+in Bärenreiter because of context. We don't detect that yet.
 
-Note that the Barenreiter edition contains a few engraving
+Note that the Bärenreiter edition contains a few engraving
 mistakes. The second line begins with measure 6 (but prints 5). The |:
 half way in measure 13 has been forgotten.
  "
@@ -52,8 +56,9 @@ sarabandeA =  \context Voice  \relative c {
   
   << { 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  \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  \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-  \override NoteHead
-    #'after-line-breaking-callback
- = #(lambda (smob) (assert-system-count smob 6))
+%  #(assert-system-count-override 6)
   d,,2 |
 }
 
 
 sarabandeCelloGlobal = {
   \time 3/4
-  \key f \major
+  \key d \minor
   \clef bass
   \repeat "volta" 2 {
     s2.*12
@@ -148,44 +151,51 @@ sarabandeCelloStaff = \context Staff <<
   \sarabandeCelloScripts
 >>
 
-% size perversions
-smallerPaper = \paper {
-    \context { \Staff
-                 fontSize = #-1
-                 \override StaffSymbol  #'staff-space = #0.8
-                 }
-    \context { \Score
-                  \override SpacingSpanner #'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
+\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
-%           \override System #'print-function = #box-grob-stencil
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 40 4)
+      }
     }
-}
 
-\bookpaper {
-  raggedbottom = ##t
-}
-\score{
-  \sarabandeCelloStaff
-  \paper{
-    \baerPaper
+
+    \header{
+      opus= "" 
+      piece ="Sarabande" }
   }
-  \midi{ \tempo 4 = 40 }
-  \header{
-    opus= "" 
-    piece ="Sarabande" }
 }
-
 %%% Local variables:
 %%% LilyPond-indent-level:2
 %%% End: