release: 0.1.62

[lilypond.git] / mutopia / J.S.Bach / preludes-2.ly

diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index 39ba3fff8b21658706a5caed694561cbdfa2111d..9bd557f3f2e61caab2be859d59cc7f84f484b71c 100644 (file)
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -1,13 +1,17 @@
 \header{
 filename =      "preludes-2.ly";
 title =         "2";
+opus = "BWV 939";
+% blz 10
+% 
+% Six Petits Pr'eludes
+% Collection Johann Peter Kellner
+% ca 1703 - 1707
 composer =      "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
 
-\include "paper20.ly"
-
 one = \melodic{
        \octave c'';
        \textstyle "italic";
@@ -70,8 +74,8 @@ one = \melodic{
 two = \melodic{
        \octave c;
        <
-               { \voiceone; c1 ~ c ~ c }
-               { \voicetwo; 'c1 ~ 'c ~ 'c }
+               { \voiceone; c1 ~ | c ~ | c }
+               { \voicetwo; 'c1 ~ | 'c ~ | 'c }
        >
        \onevoice; |
        r8 [c-5( e-3 g-1] [e-3 c-5 c' e-4] |
@@ -79,13 +83,10 @@ two = \melodic{
        )g2-3 r4 g-2( |
        [)a8 'a-5( c-4 e-2] [c-4 'a-5 g e-3] |
        )fis2 r4 d-4 |
-       % [g32-1( fis-2 g8.-1] ) 'g4 g( )'g\mr |
-       
-       % my edition has  mordents on every g here
-       [g32-1( fis-2 g8.-1] ) 'g4 g ~ 'g |
-       % 'g( )g\mr 'g( )g\mr |
-       g ~ 'g g ~ 'g |
-       g ~ 'g g ~ 'g |
+       g-\mordent-"(\\textsharp)" 'g4 g-\mordent 'g |
+       % mordents in brackets...
+       g-\mordent 'g g-\mordent 'g |
+       g-\mordent 'g g-\mordent 'g |
        [g8 'g-5( 'b-4 d-2] ['b-4 'g-5 f!-1 d-3] |
        [)e-2 c-4 e-2 g-1] [e-3 c-5 c' e-4] |
        \textstyle "finger";
@@ -111,14 +112,13 @@ bass_staff = \type Staff = bass <
        \two
 >
 
-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <
        \treble_staff
        \bass_staff
 >
 
 a4 = \paper{
-       \paper_twenty
-       linewidth= 195.\mm;
+       linewidth= 193.\mm;
 }
 
 \score{