X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftrip.ly;h=5d9d2047ed646b27839ca4c1cefc793015491f1d;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=ed3e877acdf544cbab247394f4fff577e60b3dcd;hpb=f1346920f64c571a1475d3ded295b9637560c6bc;p=lilypond.git

diff --git a/input/trip.ly b/input/trip.ly
index ed3e877acd..5d9d2047ed 100644
--- 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,151 +22,143 @@ TODO:
 
 * lyrics.
 
+* drum, jazz, pop notation
+
 %}
 
-\version "1.3.59";
-praeludiumRight =  \notes {
-   \key e \major;
-  \clef violin;
+
+praeludiumRight =   \notes {
+   \key e \major
+  \clef violin
 
   % 13 -- how to type -- where to split -- this more neatly?
   \context Staff <
-    \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ |
-      \shifton e4-.-^^\f [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] |
+    \context Voice = I \relative c'' { \stemUp r4 dis4 e4. e8 ~ |
+      \shiftOn e4-.-^^\f [d8 fis8] \shiftOff gis4 ~ [gis8 fis16 e ] |
       fis4 ~ [fis8 e16 dis] e4 r8 e8 }
-    \context 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 }
     \context Voice = IV \relative c'' {
-      \stemdown
-      \shifton s4 gis }
+      \stemDown
+      \shiftOn s4 gis }
       
-    \context 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
 }
 
-praeludiumLeft = \notes \relative c {
-   \key e \major;
-  \clef bass;
+praeludiumLeft =  \notes \relative c {
+   \key e \major
+  \clef bass
 
   % 13
   \context Staff <
     \context Voice = two { r4 }
-    \context Voice = one { \stemup s4 dis' cis cis ~ |
+    \context Voice = one { \stemUp s4 dis' cis cis ~ |
     \times 4/5
       {  [cis8 ( cis
 
-      a \translator Staff = treble  \stemdown \shifton d
+      a \translator Staff = treble  \stemDown \shiftOn d
          )
 
       cis] }
       \translator Staff = bass 
-      \shiftoff
+      \shiftOff \stemUp
       [bis gis] cis4 |
       dis2 cis4 r8 cis }
-    \context Voice = one { \stemup bis2 }
+    \context Voice = one { \stemUp bis2 }
     \context Voice = three {
-    \property Voice.dynamicDirection  = \down
-    \stemup \shifton r4 gis ~ [gis8
+    \property Voice.DynamicLineSpanner \override #'direction  = #-1
+    \stemUp \shiftOn r4 gis ~ [gis8
       \<
 
-     gis] ~ \stemdown \shiftoff gis4 |
+     gis] ~ \stemDown \shiftOff gis4 |
      a4. fis8
        \!
      gis4. a8 ~ |
      a4 gis4 gis r8 gis }
-    \context Voice = four { \stemdown \shifton s4 fis4 e}
-    \context Voice = two { \stemdown s4 dis4 cis4 }
+    \context Voice = four { \stemDown \shiftOn s4 fis4 e}
+    \context Voice = two { \stemDown s4 dis4 cis4 }
   > |
   %16
 }
 
 
 
-
-fugaIIRight = \notes   \relative c''   {
-  \key e \major;              % E-major
-  \clef violin;
-  \time3/4;
+    
+fugaIIRight =  \notes   \relative c''   {
+  \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 {
-	  \property Voice.horizontalNoteShift=0
-	  \property Voice.verticalDirection=1 
-	  e4 
-       }
-       \context Voice=two {
-	  \property Voice.verticalDirection=1 
-	  \property Voice.horizontalNoteShift=1
-	  cis
-       }
-       \context Voice=three {
-	  \property Voice.horizontalNoteShift=2
-	  \property Voice.verticalDirection=1 
-	  ais
-       }
-       \context Voice=four {
-	  \property Voice.verticalDirection=-1 
-	  \property Voice.horizontalNoteShift=-1
-	  fis
+   {
+	  e4 -5
+       }\\
+       \\
+ {
+	  cis-4
+       }\\ \\
+       
+        {
+	  ais-3 
+       }\\ \\ 
+       {
+	  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
 }
 
-gracetest = \notes \grace { [c16 ( cis dis] }
+gracetest =  \notes \grace { [c16 ( cis dis] }
 
-fugaIILeft = \notes {
-  \key e \major;
-  \clef bass;
+fugaIILeft =  \notes {
+  \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 }
+    \relative b, < )b2 dis 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
 }
 
-fugaIIPedal = \notes \relative c {
-  \key e \major;
-  \clef bass;
+fugaIIPedal =  \notes \relative c {
+  \key e \major
+  \clef bass
 
-  %15
-  %
-  % 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] |
@@ -182,7 +179,7 @@ fugaIIPedal = \notes \relative c {
 
  	\property Score.midiInstrument = "church organ"
         \praeludiumRight 
-	 r1 \mark "B";
+	 \times 4/3 {  c4 c4 c4 }  \mark "B"
 	   \fugaIIRight }
       \context Staff = bass {
 	\property Staff.instrument = #"left"
@@ -194,39 +191,34 @@ 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 | 
-  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | 
+    \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] | 
   dis,4-\ltoe gis-\rtoe [cis,8-\ltoe
     (
-     b!-\lheel ais-\rtoe gis-\ltoe ~ ] |
-      gis8  r4.
+     b!-\lheel ais-\rtoe g-\ltoe ~ ] |
+
+% tie should generate acc.
+\break
+      g  r4.
     )
       c2^^^-^\f 
- \time 3/4;
+ \time 3/4
 
-  \fugaIIPedal }
+  \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 }
 }