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 9b586694f935f4974b6850e6161143ea84df6f7b..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.0.10";
+\version "1.3.110";
 
 
 
 praeludium_commands = \notes {
   \time 4/4;
-   \key e;
+   \key e \major;
 }
 
 praeludium_right =  \notes {
@@ -37,27 +36,27 @@ 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 ~ |
-      \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] |
+  \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 |
-      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 }
-    \type Voice = IV \relative c'' {
+    \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 }
       
-    \type 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 }
   > |
@@ -69,18 +68,19 @@ praeludium_left = \notes \relative c {
   \clef bass;
 
   % 13
-  \type Staff <
-    { \stemup r4 dis' cis cis ~ |
+  \context Staff <
+    \context Voice = two { r4 }
+    \context Voice = one { \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 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
-    { \stemdown \shifton s4 fis4 e}
-    { \stemdown s4 dis4 cis4 }
+    \context Voice = four { \stemDown \shiftOn s4 fis4 e}
+    \context Voice = two { \stemDown s4 dis4 cis4 }
   > |
   %16
 }
@@ -99,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''   {
@@ -107,33 +107,43 @@ 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:
-        |
-       x|| 
-        x||
-         x|
-      |x
-      |
-   %}
-   \type Staff <
-     { \stemup \shiftoff e4 }
-     { \stemup \shifton cis }
-     { \stemup \shifton ais }
-     { \stemdown fis }
-   > |
-  %16
-  \type Staff <
-    { \stemup 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] }
-    { \stemup \shifton [b8 fis] b2 ~ |
+    \context Voice = three {  \stemUp \shiftOn [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    { \stemdown fis2. ~ |
+    \context Voice = two {  \stemDown fis2. ~ |
       fis ~ |
       fis4 e2 }
   > |
@@ -145,13 +155,13 @@ fugaII_left = \notes {
   \clef bass;
 
   %15
-  \type Staff < 
-    { \stemdown b2 \stemup ais4 |
+  \context Staff < 
+    \context Voice = two { \stemDown b2 \stemUp ais4 |
       b2 b4 }
-    { \stemdown s2 e4 |
+    \context Voice = two { \stemDown s2 e4 |
       fis2 fis4 }
   >
-  \stemdown cis2 e4 |
+  \stemDown cis2 e4 |
   b4. b8 b4 |
   %19
 }
@@ -176,18 +186,22 @@ breakmusic = \notes {
 
 % these should be two separate scores...
 \score{
-  \type Score <
-    \type GrandStaff <
-      \type Staff = treble {
+  \context Score <
+    \context PianoStaff <
+      \context Staff = treble {
+       \property Score.midiInstrument = "church organ"
         \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 { \OrchestralScoreContext }
+  }
 
   \midi {
     \tempo 4 =96; }