The grand \paper -> \layout, \bookpaper -> \paper renaming.

[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 e767214c605e333e160646f09889abfae5635bdf..0fb0728eab534a7a5162be4c02c8554f47b0b216 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,8 +1,8 @@
-\version "2.3.2"
+\version "2.3.22"
 
 % #(ly:set-point-and-click 'line-column)
 
-forcedLastBreak = \notes { \break }
+forcedLastBreak =  { \break }
 
 %% We want this to perfectly match the Baerenreiter spacing.
 %% If we're not using 6 systems, there's definately a problem.
@@ -20,7 +20,7 @@ forcedLastBreak = \notes { \break }
 \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"
 
@@ -46,14 +46,15 @@ half way in measure 13 has been forgotten.
 }
 
 
-sarabandeA =  \context Voice \notes \relative c {
+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,)] |
+  bes[ g'] f[
+     e16(f] g[ a bes d,)] |
   cis4.\trill b8[ a g] |
 
   %% check spacing without accs: 
@@ -106,7 +107,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) |
@@ -128,7 +129,7 @@ sarabandeA =  \context Voice \notes \relative c {
 }
 
 
-sarabandeCelloGlobal = \notes{
+sarabandeCelloGlobal = {
   \time 3/4
   \key f \major
   \clef bass
@@ -139,7 +140,7 @@ sarabandeCelloGlobal = \notes{
   }
 }
 
-sarabandeCelloScripts = \notes{
+sarabandeCelloScripts = {
 }
 
 sarabandeCelloStaff = \context Staff <<
@@ -149,7 +150,7 @@ sarabandeCelloStaff = \context Staff <<
 >>
 
 % size perversions
-smallerPaper = \paper {
+smallerPaper = \layout {
     \context { \Staff
                  fontSize = #-1
                  \override StaffSymbol  #'staff-space = #0.8
@@ -162,23 +163,18 @@ smallerPaper = \paper {
     linewidth = 146.8 \mm
 }
 
-baerPaper = \paper {
-    indent = 7. \mm
-    linewidth =183.5 \mm
-    interscoreline=4.0\mm
-    \context {
-            \Score
-%           \override System #'print-function = #box-grob-stencil
-    }
+\paper {
+  raggedbottom = ##t
+  indent = 7. \mm
+  linewidth =183.5 \mm
+  betweensystemspace = 25\mm 
+  betweensystempadding = 0\mm
 }
 
-
 \score{
   \sarabandeCelloStaff
-  \paper{
-    \baerPaper
-  }
   \midi{ \tempo 4 = 40 }
+  \layout { }
   \header{
     opus= "" 
     piece ="Sarabande" }