move mutopia subdirectory

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

diff --git a/input/baerenreiter-sarabande.ly b/input/baerenreiter-sarabande.ly
index 2c4e0835b88931608beb775fb05dc318c04eb7a8..7acd483dfdbb3b5527e1da326b4bdaa5dafbc169 100644 (file)
--- a/input/baerenreiter-sarabande.ly
+++ b/input/baerenreiter-sarabande.ly
@@ -8,28 +8,29 @@
   editor = "August Wenzinger"
   source= "B\\\"arenreiter Urtext"
 
-  texidoc = "The B\\\"arenreiter 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 follows the
-same beaming as the printed edition. This is done in order to
-benchmarkk the quality of the LilyPond output. As of lilypond 1.5.38,
-the spacing is almost identical. With a line-break forced before
-measure 25, we get back the linebreaking of Baerenreiter.
-
-
-
-This file used to show spacing weaknesses. Now it shows weaknesses in
-beam and slur handling.
-
-Note that the Barenreiter edition contains an engraving mistake. The
-second line begins with measure 6 (but prints 5).
-
-"
-
+  texidoc = "The B\\\"arenreiter 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
+linebreaking as the printed edition. This is done in order to
+benchmark the quality of the LilyPond output.
+
+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
+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.
+
+Note that the Barenreiter 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.
+ "
 }
 
 
-\version "1.3.148"
+\version "1.5.49"
 
 
 sarabandeA =  \context Voice \notes \relative c {
@@ -51,7 +52,7 @@ sarabandeA =  \context Voice \notes \relative c {
 
   g8 bes16()a c()bes a()g d'8 f, |
   <  e4.-\trill
-     \\ <a,,4 e'> >
+  \\ <c,4 g'> >
   [d8 c bes]
   %%8
   < { f'8 g16()a a4. g16()f  |
@@ -69,9 +70,7 @@ sarabandeA =  \context Voice \notes \relative c {
 
   fis8.-\trill es16 d8 c |
   [bes g']
-  \stemUp
   [a, fis']
-  \stemBoth
   [es' d] |
   %%16
   < bes4.-\trill d, g, > [a8 g f!] |
@@ -97,10 +96,11 @@ sarabandeA =  \context Voice \notes \relative c {
     \\
     { f,4 fis4. s8 |
       <d4 g,> gis4.   } >
-  \stemUp
+  \voiceOne
   d16(cis)d f,
-  \stemBoth
-  [a,8 e'] [d' cis] |
+  [a,8 e']
+  \oneVoice
+  [d' cis] |
   d4 d,,2 |
 }
 
@@ -110,7 +110,7 @@ sarabande =  \context Staff \notes<
   
 >
 
-\version "1.3.148"
+\version "1.5.49"
 
 sarabandeCelloGlobal =  \notes{
   \time 3/4
@@ -132,16 +132,36 @@ sarabandeCelloStaff =  \context Staff <
   \sarabandeCelloScripts
 >
 
-\score{
-  \sarabandeCelloStaff
-  \paper{
-    indent = 7. \mm
-    linewidth = 183.5 \mm
+% size perversions
+smallerPaper = \paper {
+    \translator { \StaffContext
+                 fontSize = #-1
+                 StaffSymbol \override  #'staff-space = #0.8
+                 }
     \translator { \ScoreContext
-                 %% SpacingSpanner \override #'maximum-duration-for-spacing = #(make-moment 1 16)
+                  SpacingSpanner \override #'spacing-increment = #0.96
+               }
+       
+    indent = 5.6 \mm
+    linewidth = 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
+    }
+}
 
-               }}
+
+\score{
+  \sarabandeCelloStaff
+  \paper{
+    \baerPaper
+  }
   \midi{ \tempo 4 = 40 }
   \header{
     opus= ""