patch::: 1.3.86.jcn1

[lilypond.git] / input / trip.ly

diff --git a/input/trip.ly b/input/trip.ly
index 5cccdb146de3cf4ed14fdac81d477b2f9c44a90e..ed3e877acdf544cbab247394f4fff577e60b3dcd 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -7,20 +7,21 @@
 %{
 
 This file tests as much features of lily as possible. If there are any
-basic faults in , this file will not run correctly.
+basic faults in lily, this file will not run correctly.
 
 TODO:
 
-* add tuplets
-
-* repeats.
+* autochange.
 
 * tremolo
 
+* lyrics.
+
 %}
 
+\version "1.3.59";
 praeludiumRight =  \notes {
-   \key e;
+   \key e \major;
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
@@ -46,14 +47,13 @@ praeludiumRight =  \notes {
 }
 
 praeludiumLeft = \notes \relative c {
-   \key e;
+   \key e \major;
   \clef bass;
 
   % 13
   \context Staff <
     \context Voice = two { r4 }
     \context Voice = one { \stemup s4 dis' cis cis ~ |
-    % BUG -> (insane springs.)
     \times 4/5
       {  [cis8 ( cis
 
@@ -86,7 +86,7 @@ praeludiumLeft = \notes \relative c {
 
 
 fugaIIRight = \notes   \relative c''   {
-  \key e;              % E-major
+  \key e \major;              % E-major
   \clef violin;
   \time3/4;
 
@@ -137,7 +137,7 @@ fugaIIRight = \notes   \relative c''   {
 gracetest = \notes \grace { [c16 ( cis dis] }
 
 fugaIILeft = \notes {
-  \key e;
+  \key e \major;
   \clef bass;
 
   %15
@@ -155,11 +155,14 @@ fugaIILeft = \notes {
 }
 
 fugaIIPedal = \notes \relative c {
-  \key e;
+  \key e \major;
   \clef bass;
 
   %15
-  dis4.-\ltoe e8-\rtoe cis4 |
+  %
+  % TODO: the volta typesetting should spread over the complete score.
+  %
+  \repeat "volta" 2 { dis4.-\ltoe } \alternative { e8-\rtoe cis4 } |
   b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |
   fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] |
   dis4-\rtoe e4-\rheel e,4-\ltoe |
@@ -192,7 +195,7 @@ fugaIIPedal = \notes \relative c {
         \property Staff.instr = #"bs"  
 
         \time 4/4;
-       \key e; 
+       \key e \major; 
   \clef bass;
 
   %13