patch::: 1.3.33.jcn2

[lilypond.git] / mutopia / Coriolan / viola-2.ly

diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index 57488543b5c24c9be74e024b312de7dc26fc569f..e2dd6f56d346c6e02863d77674ca4e6e52e7f3e2 100644 (file)
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -7,38 +7,52 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.19";
+\version "1.3.4";
 
 viola2 = \notes \relative c {
        % starts on (actualy, most part is on) same staff as viola1
        %urg, parse error
 %urg   \translator Staff=viola1
+       \context Thread
        \translator Staff=violai
-       \context Voice=one
-       c1 ~ | c | s1*2 |
+       \translator Voice=one
+       c1 ~ |
+       c |
+       s1*2 |
        % copied 3 bars from three back...
-       c ~ | c | s1*2 % |
+       c ~ |
+       c |
+       s1*2 % |
 %      \translator Staff=viola
-       c ~ | c | s1*2 | 
-       g'4-. r r2 | g4-. r r2 |
+       c ~ |
+       c |
+       s1*2 | 
+       g'4-. r r2 |
+       g4-. r r2 |
        %15
        s1*14
        % same as viola-1, octave lower
-       r8 c,-.\p c4. c8-. c4~ | [c8-"cresc." c-.]c2.~ |
-       [c8 c-.]c2.~ | [c8 c-.] c4. c8-. c4~ | [c8 c8-.] c4. c8-. c4 |
+       r8 c,-.\p c4. c8-. c4~ |
+       \property Voice.crescendoText = "cresc."
+       \property Voice.crescendoSpanner = "dashed-line"
+       [c8\< c-.]c2.~ |
+       [c8 c-.]c2.~ |
+       [c8 c-.] c4. c8-. c4~ |
+       [c8 c8-.] c4. c8-. c4 |
        %35
-       [as'16\ff as a as][as as as as]as2:16 |
+       [\!as'16\ff as a as][as as as as]as2:16 |
 }
 
 % $viola2_staff = \context Staff = viola_2 <
 $viola2_staff = \context Staff = violaii <
-       \property Staff.midiInstrument = "viola"
-       \property Staff.instrument = "Viola II"
-       \property Staff.instr = "Vla. II"
+       \property Staff.midiInstrument = #"viola"
+       \property Staff.instrument = #"Viola II"
+       \property Staff.instr = #"Vla. II"
        \clef "alto";
-       \notes \context Voice=one< 
+       % notes must go to Staff context: we want to switch Staff translators
+       %\notes \context Voice=one< 
                \global
                \$viola2
-       >
+       %>
 >