release: 1.3.111

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

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 3f9deec1813d8294da45f8fee1686a19509fc9ea..ddab22209a186cd4fa47dddb80dc90a8277ccd27 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.2.0";
+\version "1.3.110";
 
 
 
 praeludium_commands = \notes {
   \time 4/4;
-   \key e;
+   \key e \major;
 }
 
 praeludium_right =  \notes {
@@ -38,26 +37,26 @@ praeludium_right =  \notes {
 
   % 13 -- how to type -- where to split -- this more neatly?
   \context Staff <
-    \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ |
-      \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] |
+    \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 }
-    \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis |
-      a' ~ [a16 gis a b] \shifton dis,4 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 }
     \context Voice = IV \relative c'' {
 
-      %\stemup
+      %\stemUp
       %{
       this is a diversion from the Griepenkerl/Keller
        edition; a hack to avoid collisions
       %}
-      \stemdown
-      \shifton s4 gis }
+      \stemDown
+      \shiftOn s4 gis }
       
-    \context Voice =  II \relative c' { \stemdown
-%      \shifton       % idem
+    \context Voice =  II \relative c' { \stemDown
+%      \shiftOn       % idem
 
-      r4 fis \shiftoff gis gis |
+      r4 fis \shiftOff gis gis |
       a4. cis8 gis2 |
       fis4 gis gis r8 e8 }
   > |
@@ -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}
+%    { \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''   {
@@ -109,11 +108,10 @@ fugaII_right = \notes   \relative c''   {
 
   %15
   \context Staff <
-    \context Voice = VA { \stemup [b8 fis8] b4 }
-    \context Voice = VB {  \stemdown fis2 }
+    \context Voice = VA { \stemUp [b8 fis8] b4 }
+    \context Voice = VB {  \stemDown fis2 }
   >
 
-  % Wadieuw
   \context Staff \notes\relative c''<
        \context Voice=one {
          \property Voice.horizontalNoteShift=0
@@ -139,13 +137,13 @@ fugaII_right = \notes   \relative c''   {
 
     %16
     \context Staff <
-      \context VoiceOne {  dis2 dis4 |
+      \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 }
   > |
@@ -158,12 +156,12 @@ 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 |
+  \stemDown cis2 e4 |
   b4. b8 b4 |
   %19
 }
@@ -201,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 }
   }