release: 1.3.133

[lilypond.git] / input / trip.ly

diff --git a/input/trip.ly b/input/trip.ly
index f943744f35d2a91a8fd74398d159043b10126955..53b5cb9cded928c3cb5c7224c7c3f1b3a2fac9b3 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -19,8 +19,8 @@ TODO:
 
 %}
 
-\version "1.3.96";
-praeludiumRight =  \notes {
+\version "1.3.117";
+praeludiumRight =   \notes {
    \key e \major;
   \clef violin;
 
@@ -46,7 +46,7 @@ praeludiumRight =  \notes {
   % 16
 }
 
-praeludiumLeft = \notes \relative c {
+praeludiumLeft =  \notes \relative c {
    \key e \major;
   \clef bass;
 
@@ -67,7 +67,7 @@ praeludiumLeft = \notes \relative c {
       dis2 cis4 r8 cis }
     \context Voice = one { \stemUp bis2 }
     \context Voice = three {
-    \property Voice.DynamicLineSpanner \push #'direction  = #-1
+    \property Voice.DynamicLineSpanner \override #'direction  = #-1
     \stemUp \shiftOn r4 gis ~ [gis8
       \<
 
@@ -85,7 +85,7 @@ praeludiumLeft = \notes \relative c {
 
 
 
-fugaIIRight = \notes   \relative c''   {
+fugaIIRight =  \notes   \relative c''   {
   \key e \major;              % E-major
   \clef violin;
   \time3/4;
@@ -100,22 +100,22 @@ fugaIIRight = \notes   \relative c''   {
        \context Voice=one {
        \shiftOff
        \stemUp
-         e4 
+         e4 -5
        }
        \context Voice=two {
          \shiftOn
          \stemUp
-         cis
+         cis-4
        }
        \context Voice=three {
          \shiftOnn
          \stemUp
-         ais
+         ais-3 
        }
        \context Voice=four {
          \shiftOnnn
          \stemUp
-         fis
+         fis-2
        }
   >
 
@@ -134,9 +134,9 @@ fugaIIRight = \notes   \relative c''   {
   %19
 }
 
-gracetest = \notes \grace { [c16 ( cis dis] }
+gracetest =  \notes \grace { [c16 ( cis dis] }
 
-fugaIILeft = \notes {
+fugaIILeft =  \notes {
   \key e \major;
   \clef bass;
 
@@ -154,7 +154,7 @@ fugaIILeft = \notes {
   %19
 }
 
-fugaIIPedal = \notes \relative c {
+fugaIIPedal =  \notes \relative c {
   \key e \major;
   \clef bass;
 
@@ -178,7 +178,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"
@@ -196,11 +196,16 @@ fugaIIPedal = \notes \relative c {
 
   %13
   r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
-  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | 
+% 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;