X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpraeludium-fuga-E.ly;h=3b421a3525f57803da78da3188ae1a8194670b1c;hb=3b3e161088f1a4be942e67729d0f89f0e8d31c51;hp=2b05688939cbdf532f3f2ca111ad2e5532b5ff5f;hpb=8437de9f9840db2227c0142408979c95c3118e5c;p=lilypond.git

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 2b05688939..3b421a3525 100644
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -2,15 +2,18 @@
   filename =    "praeludium-fuga-E.ly";
   title =       "praeludium and fuga in E-major";
   opus =        "BWV 566";
-  description = "Praeludium 3 bar excerpt, "
-                "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.";
   composer =    "Johann Sebastian Bach (1685-1750)";
   enteredby =   "JCN";
   copyright =   "public domain";
 }
+%{
+  description
 
+  Praeludium 3 bar excerpt,
+	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:
  purpose of this file is testing: 
@@ -19,166 +22,187 @@
    * organ staff...
 %}
 
-\version "0.1.9";
+\version "1.3.117";
 
-noShift = { \property Voice.hshift = 0 }
-Shift = { \property Voice.hshift = 1 }
 
 
-praeludium_commands = \melodic {
-  \meter 4/4;
-  \key fis cis gis dis;             % E-major
+praeludiumCommands =  \notes {
+  \time 4/4;
+   \key e \major;
 }
 
-praeludium_right = \melodic {
-  \$praeludium_commands
-  \octave c';
+praeludiumRight =   \notes {
+  \praeludiumCommands
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
-  \multi 2 <
-    { \stemup r4 dis'4 e'4. e'8 ~ |
-      \Shift e'4 [d'8 fis'8] \noShift 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 ~ |
-      [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 }
-    { \stemup \Shift s4 gis4 }
-    { \stemdown \Shift r4 fis4 \noShift gis4 gis4 |
-      a4. cis'8 gis2 |
-      fis4 gis4 gis4 r8 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 }
+    \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
+      %{
+      this is a diversion from the Griepenkerl/Keller
+       edition; a hack to avoid collisions
+      %}
+      \stemDown
+      \shiftOn s4 gis }
+      
+    \context Voice =  II \relative c' { \stemDown
+%      \shiftOn       % idem
+
+      r4 fis \shiftOff gis gis |
+      a4. cis8 gis2 |
+      fis4 gis gis r8 e8 }
   > |
   % 16
 }
 
-praeludium_left = \melodic {
-  \$praeludium_commands
-  \octave c;
+praeludiumLeft =  \notes \relative c {
+  \praeludiumCommands
   \clef bass;
 
   % 13
-  \multi 2 <
-    { \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 |
+  \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 }
+    \context Voice = one { \stemUp bis2 }
+    \context Voice = three { \stemUp \shiftOn r4 gis ~ [gis8 gis] ~ \stemDown \shiftOff gis4 |
       a4. fis8 gis4. a8 ~ |
-      a4 gis4 gis4 r8 gis8 }
-    { \stemup \Shift s4 fis4 e}
-    { \stemdown s4 dis4 cis4 }
+      a4 gis4 gis r8 gis }
+%    { \stemUp \shiftOn s4 fis4 e}
+% a quick hack to avoid some collisons
+    \context Voice = four { \stemDown \shiftOn s4 fis4 e}
+    \context Voice = two { \stemDown s4 dis4 cis4 }
   > |
-  % 16
+  %16
 }
 
-praeludium_pedal = \melodic {
-  \$praeludium_commands  
-  \octave c;
+praeludiumPedal =  \notes \relative c{
+  \praeludiumCommands  
   \clef bass;
 
-  % 13
-  r4 'fis4-\ltoe 'e4.-\lheel e8-\rheel | 
-  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a8-\rtoe] | 
-  dis4-\ltoe gis4-\rtoe [cis8-\ltoe 'b!8-\lheel 'ais8-\rtoe 'gis8-\ltoe] |
-  % 16
+  %13
+  r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
+  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | 
+  dis,4-\ltoe gis-\rtoe [cis,8-\ltoe b!-\lheel ais-\rtoe gis-\ltoe] |
+  %16
 }
 
 
-fuga2_commands = \melodic{
-  \meter 3/4;
-  \key fis cis gis dis;             % E-major
+fugaIICommands =  \notes{
+  \time3/4;
+  \key e \major;              % E-major
 }
 
-fuga2_right = \melodic {
-  \$fuga2_commands
-  \octave c';
+fugaIIRight =  \notes   \relative c''   {
+  \fugaIICommands
   \clef violin;
 
-  % 15
-  \multi 2 <
-    { \stemup [b8 fis8] b4 }
-    { \stemdown fis2 }
+  %15
+  \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
-      |
-   %}
-   \multi 2 <
-     { \stemup \noShift e'4 }
-     { \stemup \Shift cis'4 }
-     { \stemup \Shift ais4 }
-     { \stemdown fis4 }
-   > |
-  % 16
-  \multi 2 <
-    { \stemup dis'2 dis'4 |
-      cis'2 cis'4 |
-      b4. [cis'8 dis'8 e'8] }
-    { \stemup \Shift [b8 fis8] b2 ~ |
-      [b8 a!16 gis16] a2 ~ |
+
+  \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 Voice = three {  \stemUp \shiftOn [b8 fis] b2 ~ |
+      [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    { \stemdown fis2. ~ |
-      fis2. ~ |
+    \context Voice = two {  \stemDown fis2. ~ |
+      fis ~ |
       fis4 e2 }
   > |
-  % 19
+  %19
 }
 
-fuga2_left = \melodic {
-  \$fuga2_commands  
-  \octave c;
+fugaIILeft =  \notes {
+  \fugaIICommands  
   \clef bass;
 
-  % 15
-  \multi 2 < 
-    { \stemdown b2 \stemup ais4 |
+  %15
+  \context Staff < 
+    \context Voice = two { \stemDown b2 \stemUp ais4 |
       b2 b4 }
-    { \stemdown s2 e4 |
+    \context Voice = two { \stemDown s2 e4 |
       fis2 fis4 }
   >
-  \stemdown cis'2 e'4 |
+  \stemDown cis2 e4 |
   b4. b8 b4 |
-  % 19
+  %19
 }
 
-fuga2_pedal = \melodic {
-  \$fuga2_commands  
-  \octave c;
+fugaIIPedal =  \notes \relative c {
+  \fugaIICommands  
   \clef bass;
 
-  % 15
+  %15
   dis4.-\ltoe e8-\rtoe cis4 |
-  'b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |
+  b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |
   fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] |
-  dis4-\rtoe e4-\rheel 'e4-\ltoe |
-  % 19
+  dis4-\rtoe e4-\rheel e,4-\ltoe |
+  %19
 }
 
-breakmusic = \melodic { 
-  %\meter 4/4;
+breakmusic =  \notes { 
+  %\time4/4;
   r1
 }
 
 
 % these should be two separate scores...
 \score{
-  \type Score <
-    \type Grandstaff <
-      \type Staff = treble {
-        \praeludium_right \breakmusic \fuga2_right }
-      \type Staff = bass { 
-        \praeludium_left \breakmusic \fuga2_left }
+  \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 }
     > 
-    \type Staff = pedal {
-      \praeludium_pedal \breakmusic \fuga2_pedal }
+    \context Staff = pedal {
+      \praeludium_pedal \breakmusic \fugaII_pedal }
   >
 
-  \paper{}
+  \paper {
+
+   \translator { \OrchestralScoreContext }
+  }
 
   \midi {
-    \tempo 4 = 96; }
+    \tempo 4 =96; }
 }