X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpraeludium-fuga-E.ly;h=34289d19bd1a6a40691571f3beb8182b450d844b;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=f02724fd86bfd7ca39143dd90a2d0f8820069c54;hpb=8f58f4428d70961938e9151097886d861b3faeb3;p=lilypond.git

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index f02724fd86..34289d19bd 100644
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -1,10 +1,11 @@
+\version "1.3.146"
 \header {
-  filename =    "praeludium-fuga-E.ly";
-  title =       "praeludium and fuga in E-major";
-  opus =        "BWV 566";
-  composer =    "Johann Sebastian Bach (1685-1750)";
-  enteredby =   "JCN";
-  copyright =   "public domain";
+  filename =    "praeludium-fuga-E.ly"
+  title =       "praeludium and fuga in E-major"
+  opus =        "BWV 566"
+  composer =    "Johann Sebastian Bach (1685-1750)"
+  enteredby =   "JCN"
+  copyright =   "public domain"
 }
 %{
   description
@@ -13,7 +14,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,72 +23,72 @@
    * organ staff...
 %}
 
-\version "1.0.14";
 
 
 
-praeludium_commands = \notes {
-  \time 4/4;
-   \key e;
+
+praeludiumCommands =  \notes {
+  \time 4/4
+   \key e \major
 }
 
-praeludium_right =  \notes {
-  \$praeludium_commands
-  \clef violin;
+praeludiumRight =   \notes {
+  \praeludiumCommands
+  \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
+       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 }
   > |
   % 16
 }
 
-praeludium_left = \notes \relative c {
-  \$praeludium_commands
-  \clef bass;
+praeludiumLeft =  \notes \relative c {
+  \praeludiumCommands
+  \clef bass
 
   % 13
-  \type Staff <
-    \type VoiceTwo { r4 }
-    \type VoiceOne { \stemup s4 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 }
-    \type VoiceOne { \stemup bis2 }
-    \type 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
-    \type VoiceFour { \stemdown \shifton s4 fis4 e}
-    \type VoiceTwo { \stemdown s4 dis4 cis4 }
+    \context Voice = four { \stemDown \shiftOn s4 fis4 e}
+    \context Voice = two { \stemDown s4 dis4 cis4 }
   > |
   %16
 }
 
-praeludium_pedal = \notes \relative c{
-  \$praeludium_commands  
-  \clef bass;
+praeludiumPedal =  \notes \relative c{
+  \praeludiumCommands  
+  \clef bass
 
   %13
   r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
@@ -98,68 +98,78 @@ praeludium_pedal = \notes \relative c{
 }
 
 
-fugaII_commands = \notes{
-  \time3/4;
-  \key e;              % E-major
+fugaIICommands =  \notes{
+  \time3/4
+  \key e \major              % E-major
 }
 
-fugaII_right = \notes   \relative c''   {
-  \$fugaII_commands
-  \clef violin;
+fugaIIRight =  \notes   \relative c''   {
+  \fugaIICommands
+  \clef violin
 
   %15
-  \type Staff <
-    \type Voice = VA { \stemup [b8 fis8] b4 }
-    \type Voice = VB {  \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 <
-    \type VoiceOne {  dis2 dis4 |
+
+  \context Staff \notes\relative c''<
+       \context Voice=one {
+	  \property Voice.NoteColumn \override #'horizontal-shift = #0
+	  \stemUp\slurUp\tieUp 
+	  e4 
+       }
+       \context Voice=two {
+	  \stemUp\slurUp\tieUp 
+	  \property Voice.NoteColumn \override #'horizontal-shift = #1
+	  cis
+       }
+       \context Voice=three {
+	  \property Voice.NoteColumn \override #'horizontal-shift = #2
+	  \stemUp\slurUp\tieUp 
+	  ais
+       }
+       \context Voice=four {
+	  \stemDown\slurDown\tieDown 
+	  \property Voice.NoteColumn \override #'horizontal-shift = #-1
+	  fis
+       }
+  >
+
+    %16
+    \context Staff <
+      \context Voice = one {  dis2 dis4 |
       cis2 cis4 |
       b4. [cis8 dis e] }
-    \type VoiceThree {  \stemup \shifton [b8 fis] b2 ~ |
+    \context Voice = three {  \stemUp \shiftOn [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    \type VoiceTwo {  \stemdown fis2. ~ |
+    \context Voice = two {  \stemDown fis2. ~ |
       fis ~ |
       fis4 e2 }
   > |
   %19
 }
 
-fugaII_left = \notes {
-  \$fugaII_commands  
-  \clef bass;
+fugaIILeft =  \notes {
+  \fugaIICommands  
+  \clef bass
 
   %15
-  \type Staff < 
-    \type VoiceTwo { \stemdown b2 \stemup ais4 |
+  \context Staff < 
+    \context Voice = two { \stemDown b2 \stemUp ais4 |
       b2 b4 }
-    \type VoiceTwo { \stemdown s2 e4 |
+    \context Voice = two { \stemDown s2 e4 |
       fis2 fis4 }
   >
-  \stemdown cis2 e4 |
+  \stemDown cis2 e4 |
   b4. b8 b4 |
   %19
 }
 
-fugaII_pedal = \notes \relative c {
-  \$fugaII_commands  
-  \clef bass;
+fugaIIPedal =  \notes \relative c {
+  \fugaIICommands  
+  \clef bass
 
   %15
   dis4.-\ltoe e8-\rtoe cis4 |
@@ -169,59 +179,31 @@ fugaII_pedal = \notes \relative c {
   %19
 }
 
-breakmusic = \notes { 
-  %\time4/4;
+breakmusic =  \notes { 
+  %\time4/4
   r1
 }
 
 
 % these should be two separate scores...
 \score{
-  \type Score <
-    \type PianoStaff <
-      \type Staff = treble {
-        \praeludium_right \breakmusic \fugaII_right }
-      \type Staff = bass { 
-        \praeludium_left \breakmusic \fugaII_left }
+  \context Score <
+    \context PianoStaff <
+      \context Staff = treble {
+ 	\property Score.midiInstrument = "church organ"
+        \praeludiumRight \breakmusic \fugaIIRight }
+      \context Staff = bass { 
+        \praeludiumLeft \breakmusic \fugaIILeft }
     > 
-    \type Staff = pedal {
-      \praeludium_pedal \breakmusic \fugaII_pedal }
+    \context Staff = pedal {
+      \praeludiumPedal \breakmusic \fugaIIPedal }
   >
 
   \paper {
-    \translator {
-    \VoiceContext
-    \name "VoiceOne";
-    ydirection = "1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceTwo";
-    ydirection = "-1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceThree";
-    ydirection = "1";
-    hshift = "1";
-    }
-    \translator {
-    \VoiceContext
-    \name "VoiceFour";
-    ydirection = "-1";
-    hshift = "1";
-    }
-   \translator { 
-     \StaffContext 
-     
-     \accepts VoiceFour;
-     \accepts VoiceThree;
-     \accepts VoiceTwo;
-     \accepts VoiceOne;
-   }
-%   \translator { \OrchestralScoreContext }
+
+   \translator { \OrchestralScoreContext }
   }
 
   \midi {
-    \tempo 4 =96; }
+    \tempo 4 =96 }
 }