release: 1.2.14

[lilypond.git] / mutopia / J.S.Bach / Petites-Preludes / preludes-6.ly

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index dd1472ae6a2a110633884ad6ccb4d4560ab9265b..3cc949bbc4526e7269314f6aa575fd8e33867b42 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -1,6 +1,8 @@
 \header{
 filename =     "preludes-6.ly";
-% blz 11
+%
+% page 11
+%
 % Six Petits Preludes
 % Collection Johann Peter Kellner
 % ca 1703 - 1707
@@ -8,11 +10,11 @@ composer =   "Johann Sebastian Bach (1685-1750)";
 enteredby =    "jcn";
 copyright =    "public domain";
 }
-\version "1.0.14";
+\version "1.2.0";
 
 
-one = \type Staff \notes\relative c{
-       \type Voice=i
+one = \context Staff \notes\relative c{
+       \context Voice=i
        \skip 1; |
        \stemup
        r4 d''2-5( cis4-4 |
@@ -20,9 +22,9 @@ one = \type Staff \notes\relative c{
        )d16-5\mf a'-4( g f  e f-4 cis-2 d-1 
        e8.-\mordent f16  d8.-\prall-1 cis16-3 |
        \stemup
-       )cis4\> ~ cis16 a \!d8 ~ d4 c-5 |
+       )cis4\> ~ cis16 a \!d8 ~ d4 a( |
        %5
-       b2-4 ~ b4 a-5 ~ |
+       )b2-4 ~ b4 a-5 ~ |
        a16 a-5 \stemup g! f g4-4\< ~ g f-3 ~ |
        \!f16 a g f  e16 g8.-5 ~  g16 g-5 f-4 e-3  d-1 f8.-4 ~ |
        f16 f-3 e d b'4 a-5 g-5 |
@@ -33,8 +35,8 @@ one = \type Staff \notes\relative c{
        \bar "|.";
 }
 
-two = \type Staff \notes\relative c{
-       \type Voice=ii
+two = \context Staff \notes\relative c{
+       \context Voice=ii
        r16\p d''-5( c-4 bes-3  a-2 bes-3 f-1 g-2 
        a8.-\mordent bes16-1  g8.-\prall f16-1 |
        \stemdown
@@ -53,8 +55,8 @@ two = \type Staff \notes\relative c{
        fis1-2
 }
 
-three = \type Staff \notes\relative c{
-       \type Voice=iii
+three = \context Staff \notes\relative c{
+       \context Voice=iii
        \stemup
        f2-1( e-2 |
        \stemboth
@@ -67,7 +69,7 @@ three = \type Staff \notes\relative c{
        e8.-\mordent f16  d8.-\prall-4 c16-5 \stemboth )c4.-5 d8-4 |
        \stemdown
        e4 ~ e16 f-2( e-3 d-4  cis a b cis-3  d-4 e-3 f-2 d-4 |
-       \property Voice . textstyle = "finger"
+       \property Voice . textStyle = "finger"
        )bes!2-"5\\_4" a ~ |
        a a |
        d, cis'-5 |
@@ -76,16 +78,18 @@ three = \type Staff \notes\relative c{
        \bar "|.";
 }
 
-four = \type Staff \notes\relative c{
-       \type Voice=iv
+four = \context Staff \notes\relative c{
+       \context Voice=iv
        \stemdown 
        d2-3 cis-4 |
-       \skip 1*3; |
+       \skip 1*2; |
+       \skip 4*3;
+       \translator Staff=upper \stemup \property Voice.horizontalNoteShift = 1 
+       c''4-5 |
        %5
-       \translator Staff=upper \stemup \property Voice.hshift = 1 
-       a'4 gis-2 ~ gis16 gis-3 fis e 
+       a gis-2 ~ gis16 gis-3 fis e 
        \skip 4*1;
-       \translator Staff=lower \stemdown \property Voice.hshift = 0 
+       \translator Staff=lower \stemdown \property Voice.horizontalNoteShift = 0 
        \stemup
        b2-1 a-1 |
        g a4. gis16 a |
@@ -103,13 +107,13 @@ global = \notes{
 
 \score{
        % Allegretto
-       \type GrandStaff <
-               \type Staff = upper <
+       \context PianoStaff <
+               \context Staff = upper <
                        \global
                        \one
                        \two
                >
-               \type Staff = lower <
+               \context Staff = lower <
                        \global
                        \clef "bass";
                        \three
@@ -117,13 +121,6 @@ global = \notes{
                >
        >
        \paper{
-               \include "preludes-paper.ly";
-               gourlay_maxmeasures = 3.0;
-               \translator{ 
-                       \GrandStaffContext
-                       minVerticalAlign = 3.0*\staffheight;
-                       maxVerticalAlign = 3.0*\staffheight;
-               }
        }
        \midi{ \tempo 4 = 40; }
        \header{