release: 1.1.43

[lilypond.git] / input / praeludium-fuga-E.ly

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 9b586694f935f4974b6850e6161143ea84df6f7b..5fd8dfff59a21945a7bc94dca622d97217617a7a 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -23,7 +23,7 @@
    * organ staff...
 %}
 
-\version "1.0.10";
+\version "1.0.19";
 
 
 
@@ -37,14 +37,14 @@ praeludium_right =  \notes {
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
-  \type Staff <
-    \type Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ |
+  \context Staff <
+    \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ |
       \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] |
       fis4 ~ [fis8 e16 dis] e4 r8 e8 }
-    \type Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis |
+    \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis |
       a' ~ [a16 gis a b] \shifton dis,4 cis ~ |
       [cis8 dis16 ais] bis4 cis r8 b }
-    \type Voice = IV \relative c'' {
+    \context Voice = IV \relative c'' {
 
       %\stemup
       %{
@@ -54,7 +54,7 @@ praeludium_right =  \notes {
       \stemdown
       \shifton s4 gis }
       
-    \type Voice =  II \relative c' { \stemdown
+    \context Voice =  II \relative c' { \stemdown
 %      \shifton       % idem
 
       r4 fis \shiftoff gis gis |
@@ -69,18 +69,19 @@ praeludium_left = \notes \relative c {
   \clef bass;
 
   % 13
-  \type Staff <
-    { \stemup r4 dis' cis cis ~ |
+  \context Staff <
+    \context VoiceTwo { r4 }
+    \context VoiceOne { \stemup s4 dis' cis cis ~ |
       [cis8 a d cis] [bis gis] cis4 |
       dis2 cis4 r8 cis }
-    { \stemup bis2 }
-    { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 |
+    \context VoiceOne { \stemup bis2 }
+    \context VoiceThree { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 |
       a4. fis8 gis4. a8 ~ |
       a4 gis4 gis r8 gis }
 %    { \stemup \shifton s4 fis4 e}
 % a quick hack to avoid some collisons
-    { \stemdown \shifton s4 fis4 e}
-    { \stemdown s4 dis4 cis4 }
+    \context VoiceFour { \stemdown \shifton s4 fis4 e}
+    \context VoiceTwo { \stemdown s4 dis4 cis4 }
   > |
   %16
 }
@@ -107,9 +108,9 @@ fugaII_right = \notes   \relative c''   {
   \clef violin;
 
   %15
-  \type Staff <
-    { \stemup [b8 fis8] b4 }
-    { \stemdown fis2 }
+  \context Staff <
+    \context Voice = VA { \stemup [b8 fis8] b4 }
+    \context Voice = VB {  \stemdown fis2 }
   >
    %{ this chord is usually set like this:
         |
@@ -119,21 +120,21 @@ fugaII_right = \notes   \relative c''   {
       |x
       |
    %}
-   \type Staff <
+   \context Staff <
      { \stemup \shiftoff e4 }
      { \stemup \shifton cis }
      { \stemup \shifton ais }
      { \stemdown fis }
    > |
   %16
-  \type Staff <
-    { \stemup dis2 dis4 |
+  \context Staff <
+    \context VoiceOne {  dis2 dis4 |
       cis2 cis4 |
       b4. [cis8 dis e] }
-    { \stemup \shifton [b8 fis] b2 ~ |
+    \context VoiceThree {  \stemup \shifton [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    { \stemdown fis2. ~ |
+    \context VoiceTwo {  \stemdown fis2. ~ |
       fis ~ |
       fis4 e2 }
   > |
@@ -145,10 +146,10 @@ fugaII_left = \notes {
   \clef bass;
 
   %15
-  \type Staff < 
-    { \stemdown b2 \stemup ais4 |
+  \context Staff < 
+    \context VoiceTwo { \stemdown b2 \stemup ais4 |
       b2 b4 }
-    { \stemdown s2 e4 |
+    \context VoiceTwo { \stemdown s2 e4 |
       fis2 fis4 }
   >
   \stemdown cis2 e4 |
@@ -176,18 +177,50 @@ breakmusic = \notes {
 
 % these should be two separate scores...
 \score{
-  \type Score <
-    \type GrandStaff <
-      \type Staff = treble {
+  \context Score <
+    \context PianoStaff <
+      \context Staff = treble {
         \praeludium_right \breakmusic \fugaII_right }
-      \type Staff = bass { 
+      \context Staff = bass { 
         \praeludium_left \breakmusic \fugaII_left }
     > 
-    \type Staff = pedal {
+    \context Staff = pedal {
       \praeludium_pedal \breakmusic \fugaII_pedal }
   >
 
-  \paper{}
+  \paper {
+    \translator {
+    \VoiceContext
+    \name "VoiceOne";
+    ydirection = "1";
+    }
+    \translator {
+    \VoiceContext
+    \name "VoiceTwo";
+    ydirection = "-1";
+    }
+    \translator {
+    \VoiceContext
+    \name "VoiceThree";
+    ydirection = "1";
+    hshift = "1";
+    }
+    \translator {
+    \VoiceContext
+    \name "VoiceFour";
+    ydirection = "-1";
+    hshift = "1";
+    }
+   \translator { 
+     \StaffContext 
+     
+     \accepts VoiceFour;
+     \accepts VoiceThree;
+     \accepts VoiceTwo;
+     \accepts VoiceOne;
+   }
+   \translator { \OrchestralScoreContext }
+  }
 
   \midi {
     \tempo 4 =96; }