* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / input / trip.ly

diff --git a/input/trip.ly b/input/trip.ly
index 53b5cb9cded928c3cb5c7224c7c3f1b3a2fac9b3..5d9d2047ed646b27839ca4c1cefc793015491f1d 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -1,9 +1,14 @@
 \header {
-  title =       "Trip";
-  copyright =   "public domain";
+  title =       "Trip test"
+  subtitle = "Make life very difficult for lilypond"
+  copyright =   "public domain"
+  
+  footer ="This file tests as much features of lily as possible."
 }
 
 
+\version "1.5.68"
+
 %{
 
 This file tests as much features of lily as possible. If there are any
@@ -17,12 +22,14 @@ TODO:
 
 * lyrics.
 
+* drum, jazz, pop notation
+
 %}
 
-\version "1.3.117";
+
 praeludiumRight =   \notes {
-   \key e \major;
-  \clef violin;
+   \key e \major
+  \clef violin
 
   % 13 -- how to type -- where to split -- this more neatly?
   \context Staff <
@@ -47,8 +54,8 @@ praeludiumRight =   \notes {
 }
 
 praeludiumLeft =  \notes \relative c {
-   \key e \major;
-  \clef bass;
+   \key e \major
+  \clef bass
 
   % 13
   \context Staff <
@@ -62,7 +69,7 @@ praeludiumLeft =  \notes \relative c {
 
       cis] }
       \translator Staff = bass 
-      \shiftOff
+      \shiftOff \stemUp
       [bis gis] cis4 |
       dis2 cis4 r8 cis }
     \context Voice = one { \stemUp bis2 }
@@ -84,52 +91,46 @@ praeludiumLeft =  \notes \relative c {
 
 
 
-
+    
 fugaIIRight =  \notes   \relative c''   {
-  \key e \major;              % E-major
-  \clef violin;
-  \time3/4;
+  \key e \major              % E-major
+  \clef violin
+  \time 3/4
 
   %15
   \context Staff <
-    \context Voice = VA { \stemUp [b8 fis8] b4 }
-    \context Voice = VB {  \stemDown fis2 }
+     { [b8 fis8] b4 }\\
+     { fis2 }
   >
 
   \context Staff \notes\relative c''<
-       \context Voice=one {
-       \shiftOff
-       \stemUp
+   {
          e4 -5
-       }
-       \context Voice=two {
-         \shiftOn
-         \stemUp
+       }\\
+       \\
+ {
          cis-4
-       }
-       \context Voice=three {
-         \shiftOnn
-         \stemUp
+       }\\ \\
+       
+        {
          ais-3 
-       }
-       \context Voice=four {
-         \shiftOnnn
-         \stemUp
+       }\\ \\ 
+       {
          fis-2
        }
   >
 
     %16
     \context Staff <
-      \context Voice = one {  dis2 dis4 |
+ {  dis2 dis4 |
       cis2 cis4 |
-      b4. [cis8 dis e] }
-    \context Voice = three {  \stemUp \shiftOn [b8 fis] b2 ~ |
+      b4. [cis8 dis e] } \\
+ {   fis2. ~ |
+      fis ~ |
+      fis4 e2 } \\
+ {   [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    \context Voice = two {  \stemDown fis2. ~ |
-      fis ~ |
-      fis4 e2 }
   > |
   %19
 }
@@ -137,26 +138,26 @@ fugaIIRight =  \notes   \relative c''   {
 gracetest =  \notes \grace { [c16 ( cis dis] }
 
 fugaIILeft =  \notes {
-  \key e \major;
-  \clef bass;
+  \key e \major
+  \clef bass
 
   %15
   \context Staff < 
-    \context Voice = one { \stemDown
+     { 
     \gracetest
     \relative b, < )b2 dis fis a b cis dis> \stemUp ais4 |
-      b2 b4 }
-    \context Voice = two { \stemDown s2 e4 |
-      fis2 fis4 }
+      b2 b4 } \\
+      {  s2 e4 | fis2 fis4 }
   >
-  \stemBoth cis2 [e16( fis a \clef "treble"; b] |
+  \stemBoth
+  cis2 [e16( fis a \clef "treble" b] |
   d'4 ) b8 b8 b4 |
   %19
 }
 
 fugaIIPedal =  \notes \relative c {
-  \key e \major;
-  \clef bass;
+  \key e \major
+  \clef bass
 
   \repeat "volta" 2 { dis4.-\ltoe } \alternative { e8-\rtoe cis4 } |
   b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |
@@ -178,7 +179,7 @@ fugaIIPedal =  \notes \relative c {
 
        \property Score.midiInstrument = "church organ"
         \praeludiumRight 
-        \times 4/3 {  c4 c4 c4 }  \mark "B";
+        \times 4/3 {  c4 c4 c4 }  \mark "B"
           \fugaIIRight }
       \context Staff = bass {
        \property Staff.instrument = #"left"
@@ -190,12 +191,15 @@ fugaIIPedal =  \notes \relative c {
         \property Staff.instrument = #"bass"
         \property Staff.instr = #"bs"  
 
-        \time 4/4;
-       \key e \major; 
-  \clef bass;
+        \time 4/4
+       \key e \major 
+  \clef bass
 
   %13
-  r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
+    \property Staff.PhrasingSlur \override #'dashed = #5.0
+    c4 \( ( d ) e\) f
+%    r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
+
 % tie accs: 2nd should get no acc
 f4-\rtoe~ f8
 fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | 
@@ -208,26 +212,13 @@ fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] |
       g  r4.
     )
       c2^^^-^\f 
- \time 3/4;
+ \time 3/4
 
-  \fugaIIPedal \bar "|." ; }
+  \fugaIIPedal \bar "|."  }
       
     >
   >
-
-  \paper {
-
-       \translator {
-               \OrchestralScoreContext
-       }
-       \translator { \PianoStaffContext
-               \consists "Instrument_name_engraver";
-       }
-       \translator { \StaffContext
-               \consists "Instrument_name_engraver";
-       }
-  }
-
+\paper {}
   \midi {
-    \tempo 4 =96; }
+    \tempo 4 =96 }
 }