release: 1.0.1

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

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 48ea88df3bfdda7b8068dbefa7661dcb865c10bf..b198ed23f6cab4085636411edb52bcc41679fe1a 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -19,32 +19,41 @@
    * organ staff...
 %}
 
-\version "0.1.15";
+\version "1.0.0";
 
-noShift = { \property Voice.hshift = 0 }
-Shift = { \property Voice.hshift = 1 }
 
 
 praeludium_commands = \melodic {
-  \meter 4/4;
-  \key fis cis gis dis;             % E-major
+  \time 4/4;
+   \key e;
 }
 
-praeludium_right = \melodic {
+praeludium_right = \melodic\transpose c'' {
   \$praeludium_commands
-  \octave c';
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
-  \multi 2 <
+  \type Staff <
     { \stemup r4 dis'4 e'4. e'8 ~ |
-      \Shift e'4 [d'8 fis'8] \noShift gis'4 ~ [gis'8 fis'16 e'16] |
+      \shifton e'4 [d'8 fis'8] \shiftoff gis'4 ~ [gis'8 fis'16 e'16] |
       fis'4 ~ [fis'8 e'16 dis'16] e'4 r8 e'8 }
-    { \stemup \Shift r4 bis4 cis'4 \noShift cis'4 |
-      a'4 ~ [a'16 gis'16 a'16 b'16] \Shift dis'4 cis'4 ~ |
+    { \stemup \shifton r4 bis4 cis'4 \shiftoff cis'4 |
+      a'4 ~ [a'16 gis'16 a'16 b'16] \shifton dis'4 cis'4 ~ |
       [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 }
-    { \stemup \Shift s4 gis4 }
-    { \stemdown \Shift r4 fis4 \noShift gis4 gis4 |
+    {
+
+      %\stemup
+      %{
+      this is a diversion from the Griepenkerl/Keller
+       edition; a hack to avoid collisions
+      %}
+      \stemdown
+      \shifton s4 gis4 }
+      
+    { \stemdown
+%      \shifton       % idem
+
+      r4 fis4 \shiftoff gis4 gis4 |
       a4. cis'8 gis2 |
       fis4 gis4 gis4 r8 e8 }
   > |
@@ -53,19 +62,20 @@ praeludium_right = \melodic {
 
 praeludium_left = \melodic {
   \$praeludium_commands
-  \octave c;
   \clef bass;
 
   % 13
-  \multi 2 <
+  \type Staff <
     { \stemup r4 dis'4 cis'4 cis'4 ~ |
       [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 |
       dis'2 cis'4 r8 cis'8 }
     { \stemup bis2 }
-    { \stemup \Shift r4 gis4 ~ [gis 8 gis8] ~ \stemdown \noShift gis4 |
+    { \stemup \shifton r4 gis4 ~ [gis 8 gis8] ~ \stemdown \shiftoff gis4 |
       a4. fis8 gis4. a8 ~ |
       a4 gis4 gis4 r8 gis8 }
-    { \stemup \Shift s4 fis4 e}
+%    { \stemup \shifton s4 fis4 e}
+% a quick hack to avoid some collisons
+    { \stemdown \shifton s4 fis4 e}
     { \stemdown s4 dis4 cis4 }
   > |
   % 16
@@ -73,7 +83,6 @@ praeludium_left = \melodic {
 
 praeludium_pedal = \melodic {
   \$praeludium_commands  
-  \octave c;
   \clef bass;
 
   % 13
@@ -85,17 +94,16 @@ praeludium_pedal = \melodic {
 
 
 fuga2_commands = \melodic{
-  \meter 3/4;
-  \key fis cis gis dis;             % E-major
+  \time 3/4;
+  \key e;              % E-major
 }
 
-fuga2_right = \melodic {
+fuga2_right = \melodic\transpose c'' {
   \$fuga2_commands
-  \octave c';
   \clef violin;
 
   % 15
-  \multi 2 <
+  \type Staff <
     { \stemup [b8 fis8] b4 }
     { \stemdown fis2 }
   >
@@ -107,18 +115,18 @@ fuga2_right = \melodic {
       |x
       |
    %}
-   \multi 2 <
-     { \stemup \noShift e'4 }
-     { \stemup \Shift cis'4 }
-     { \stemup \Shift ais4 }
+   \type Staff <
+     { \stemup \shiftoff e'4 }
+     { \stemup \shifton cis'4 }
+     { \stemup \shifton ais4 }
      { \stemdown fis4 }
    > |
   % 16
-  \multi 2 <
+  \type Staff <
     { \stemup dis'2 dis'4 |
       cis'2 cis'4 |
       b4. [cis'8 dis'8 e'8] }
-    { \stemup \Shift [b8 fis8] b2 ~ |
+    { \stemup \shifton [b8 fis8] b2 ~ |
       [b8 a!16 gis16] a2 ~ |
       a4 gis2 }
     { \stemdown fis2. ~ |
@@ -130,11 +138,10 @@ fuga2_right = \melodic {
 
 fuga2_left = \melodic {
   \$fuga2_commands  
-  \octave c;
   \clef bass;
 
   % 15
-  \multi 2 < 
+  \type Staff < 
     { \stemdown b2 \stemup ais4 |
       b2 b4 }
     { \stemdown s2 e4 |
@@ -147,7 +154,6 @@ fuga2_left = \melodic {
 
 fuga2_pedal = \melodic {
   \$fuga2_commands  
-  \octave c;
   \clef bass;
 
   % 15
@@ -159,7 +165,7 @@ fuga2_pedal = \melodic {
 }
 
 breakmusic = \melodic { 
-  %\meter 4/4;
+  %\time 4/4;
   r1
 }
 
@@ -167,7 +173,7 @@ breakmusic = \melodic {
 % these should be two separate scores...
 \score{
   \type Score <
-    \type Grand_staff <
+    \type GrandStaff <
       \type Staff = treble {
         \praeludium_right \breakmusic \fuga2_right }
       \type Staff = bass {