release: 1.3.60

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

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 214795e22d0f853d34a97a648d6adf6ed6a090e0..cfccea91c93e7cbf785108123caa79fa1419a174 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -13,7 +13,6 @@
        2nd fuga transposed subject -- 4 bar excerpt. 
         We try to imitate the Griepenkerl/Keller edition which
        gives the best approximation to Bach's original layout
-
 %}
 %{
  Tested Features:
@@ -23,13 +22,13 @@
    * organ staff...
 %}
 
-\version "1.1.52";
+\version "1.3.59";
 
 
 
 praeludium_commands = \notes {
   \time 4/4;
-   \key e;
+   \key e \major;
 }
 
 praeludium_right =  \notes {
@@ -70,18 +69,18 @@ praeludium_left = \notes \relative c {
 
   % 13
   \context Staff <
-    \context VoiceTwo { r4 }
-    \context VoiceOne { \stemup s4 dis' cis cis ~ |
+    \context Voice = two { r4 }
+    \context Voice = one { \stemup s4 dis' cis cis ~ |
       [cis8 a d cis] [bis gis] cis4 |
       dis2 cis4 r8 cis }
-    \context VoiceOne { \stemup bis2 }
-    \context VoiceThree { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 |
+    \context Voice = one { \stemup bis2 }
+    \context Voice = three { \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
-    \context VoiceFour { \stemdown \shifton s4 fis4 e}
-    \context VoiceTwo { \stemdown s4 dis4 cis4 }
+    \context Voice = four { \stemdown \shifton s4 fis4 e}
+    \context Voice = two { \stemdown s4 dis4 cis4 }
   > |
   %16
 }
@@ -100,7 +99,7 @@ praeludium_pedal = \notes \relative c{
 
 fugaII_commands = \notes{
   \time3/4;
-  \key e;              % E-major
+  \key e \major;              % E-major
 }
 
 fugaII_right = \notes   \relative c''   {
@@ -112,29 +111,39 @@ fugaII_right = \notes   \relative c''   {
     \context Voice = VA { \stemup [b8 fis8] b4 }
     \context Voice = VB {  \stemdown fis2 }
   >
-   %{ this chord is usually set like this:
-        |
-       x|| 
-        x||
-         x|
-      |x
-      |
-   %}
-   \context Staff <
-     { \stemup \shiftoff e4 }
-     { \stemup \shifton cis }
-     { \stemup \shifton ais }
-     { \stemdown fis }
-   > |
-  %16
-  \context Staff <
-    \context VoiceOne {  dis2 dis4 |
+
+  \context Staff \notes\relative c''<
+       \context Voice=one {
+         \property Voice.horizontalNoteShift=0
+         \property Voice.verticalDirection=1 
+         e4 
+       }
+       \context Voice=two {
+         \property Voice.verticalDirection=1 
+         \property Voice.horizontalNoteShift=1
+         cis
+       }
+       \context Voice=three {
+         \property Voice.horizontalNoteShift=2
+         \property Voice.verticalDirection=1 
+         ais
+       }
+       \context Voice=four {
+         \property Voice.verticalDirection=-1 
+         \property Voice.horizontalNoteShift=-1
+         fis
+       }
+  >
+
+    %16
+    \context Staff <
+      \context Voice = one {  dis2 dis4 |
       cis2 cis4 |
       b4. [cis8 dis e] }
-    \context VoiceThree {  \stemup \shifton [b8 fis] b2 ~ |
+    \context Voice = three {  \stemup \shifton [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    \context VoiceTwo {  \stemdown fis2. ~ |
+    \context Voice = two {  \stemdown fis2. ~ |
       fis ~ |
       fis4 e2 }
   > |
@@ -147,9 +156,9 @@ fugaII_left = \notes {
 
   %15
   \context Staff < 
-    \context VoiceTwo { \stemdown b2 \stemup ais4 |
+    \context Voice = two { \stemdown b2 \stemup ais4 |
       b2 b4 }
-    \context VoiceTwo { \stemdown s2 e4 |
+    \context Voice = two { \stemdown s2 e4 |
       fis2 fis4 }
   >
   \stemdown cis2 e4 |
@@ -180,6 +189,7 @@ breakmusic = \notes {
   \context Score <
     \context PianoStaff <
       \context Staff = treble {
+       \property Score.midiInstrument = "church organ"
         \praeludium_right \breakmusic \fugaII_right }
       \context Staff = bass { 
         \praeludium_left \breakmusic \fugaII_left }
@@ -189,36 +199,7 @@ breakmusic = \notes {
   >
 
   \paper {
-    \translator {
-    \VoiceContext
-    \name "VoiceOne";
-    verticalDirection = "1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceTwo";
-    verticalDirection = "-1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceThree";
-    verticalDirection = "1";
-    horizontalNoteShift = "1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceFour";
-    verticalDirection = "-1";
-    horizontalNoteShift = "1";
-    }
-   \translator { 
-     \StaffContext 
-     
-     \accepts VoiceFour;
-     \accepts VoiceThree;
-     \accepts VoiceTwo;
-     \accepts VoiceOne;
-   }
+
    \translator { \OrchestralScoreContext }
   }