X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftrip.ly;h=4cb6535e2edf956685f4565d08d556e2f6aa7aec;hb=402ceecba9ec13943208c893535314a4162ab7ac;hp=946dfb8601b2d1199fa2e08d57efa4494c4e43d1;hpb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;p=lilypond.git

diff --git a/input/trip.ly b/input/trip.ly
index 946dfb8601..4cb6535e2e 100644
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -1,10 +1,13 @@
 \header {
-  title =       "Trip"
+  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.3.146"
+\version "1.7.18"
 
 %{
 
@@ -66,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 }
@@ -88,52 +91,46 @@ praeludiumLeft =  \notes \relative c {
 
 
 
-
+    
 fugaIIRight =  \notes   \relative c''   {
   \key e \major              % E-major
   \clef violin
-  \time3/4
+  \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
 }
@@ -146,14 +143,14 @@ fugaIILeft =  \notes {
 
   %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 }
+    \relative b, < )b2 dis-\arpeggio fis a b cis dis> \stemUp ais4 |
+      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
 }
@@ -199,7 +196,10 @@ fugaIIPedal =  \notes \relative c {
   \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] | 
@@ -218,20 +218,7 @@ fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] |
       
     >
   >
-
-  \paper {
-
-	\translator {
-		\OrchestralScoreContext
-	}
-	\translator { \PianoStaffContext
-		\consists "Instrument_name_engraver"
-	}
-	\translator { \StaffContext
-		\consists "Instrument_name_engraver"
-	}
-  }
-
+\paper {}
   \midi {
     \tempo 4 =96 }
 }