X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpraeludium-fuga-E.ly;h=315139f5d8da7715e4628126ed21479a45920a00;hb=5a682bc69d9c7c70b161d002bc6e470303a3693f;hp=970a1053e5379d3c4d8f4acd44e77cadbb8679cc;hpb=8b88bf025331c789167734067001a3d79501b433;p=lilypond.git

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 970a1053e5..315139f5d8 100644
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -1,10 +1,11 @@
+\version "1.7.18"
 \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
@@ -27,13 +28,13 @@
 
 
 praeludiumCommands =  \notes {
-  \time 4/4;
-   \key e \major;
+  \time 4/4
+   \key e \major
 }
 
 praeludiumRight =   \notes {
   \praeludiumCommands
-  \clef violin;
+  \clef violin
 
   % 13 -- how to type -- where to split -- this more neatly?
   \context Staff <
@@ -48,7 +49,7 @@ praeludiumRight =   \notes {
       %\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 }
@@ -65,7 +66,7 @@ praeludiumRight =   \notes {
 
 praeludiumLeft =  \notes \relative c {
   \praeludiumCommands
-  \clef bass;
+  \clef bass
 
   % 13
   \context Staff <
@@ -87,7 +88,7 @@ praeludiumLeft =  \notes \relative c {
 
 praeludiumPedal =  \notes \relative c{
   \praeludiumCommands  
-  \clef bass;
+  \clef bass
 
   %13
   r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
@@ -98,13 +99,13 @@ praeludiumPedal =  \notes \relative c{
 
 
 fugaIICommands =  \notes{
-  \time3/4;
-  \key e \major;              % E-major
+  \time3/4
+  \key e \major              % E-major
 }
 
 fugaIIRight =  \notes   \relative c''   {
   \fugaIICommands
-  \clef violin;
+  \clef violin
 
   %15
   \context Staff <
@@ -130,7 +131,7 @@ fugaIIRight =  \notes   \relative c''   {
        }
        \context Voice=four {
 	  \stemDown\slurDown\tieDown 
-	  \property Voice.horizontalNoteShift=-1
+	  \property Voice.NoteColumn \override #'horizontal-shift = #-1
 	  fis
        }
   >
@@ -152,7 +153,7 @@ fugaIIRight =  \notes   \relative c''   {
 
 fugaIILeft =  \notes {
   \fugaIICommands  
-  \clef bass;
+  \clef bass
 
   %15
   \context Staff < 
@@ -168,7 +169,7 @@ fugaIILeft =  \notes {
 
 fugaIIPedal =  \notes \relative c {
   \fugaIICommands  
-  \clef bass;
+  \clef bass
 
   %15
   dis4.-\ltoe e8-\rtoe cis4 |
@@ -179,7 +180,7 @@ fugaIIPedal =  \notes \relative c {
 }
 
 breakmusic =  \notes { 
-  %\time4/4;
+  %\time4/4
   r1
 }
 
@@ -190,12 +191,12 @@ breakmusic =  \notes {
     \context PianoStaff <
       \context Staff = treble {
  	\property Score.midiInstrument = "church organ"
-        \praeludium_right \breakmusic \fugaII_right }
+        \praeludiumRight \breakmusic \fugaIIRight }
       \context Staff = bass { 
-        \praeludium_left \breakmusic \fugaII_left }
+        \praeludiumLeft \breakmusic \fugaIILeft }
     > 
     \context Staff = pedal {
-      \praeludium_pedal \breakmusic \fugaII_pedal }
+      \praeludiumPedal \breakmusic \fugaIIPedal }
   >
 
   \paper {
@@ -204,5 +205,5 @@ breakmusic =  \notes {
   }
 
   \midi {
-    \tempo 4 =96; }
+    \tempo 4 =96 }
 }