patch::: 1.3.143.jcn3

[lilypond.git] / mutopia / Coriolan / timpani.ly

diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 3426d0cad9a0453b73beb80813069f846f1e0fe8..7c30e18680c50fc8e004083d06552b117d62c3d0 100644 (file)
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -1,39 +1,31 @@
-\header{
-filename =      "timpani.ly";
-xtitle =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
-description =   "";
-composer =      "Ludwig van Beethoven (1770-1827)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
 
-\version "1.3.117";
+\version "1.3.120";
 
 timpani =  \notes \relative c {
-       R1*2 |
-       c4-.\ff r r2 |
-       R1*3 |
-       c4-. r r2 |
-       R1*3 |
-       c4-. r r2 |
-       R1 |
-       g4-. r r2 |
-       g4-. r r2 |
-       R1*5 |
-       r2 r4 g4-. |
-       R1*6 |
-       r4 c-.\f r2 |
-       R1*2 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
-       r2 c4-.\p\< r |
-       r2 c4-. r |
-       r2 c4-. r |
-       c r c r |
-       \!c1\ff-\trill |
+       R1*2|
+       c4-.\ff r r2|
+       R1*3|
+       c4-. r r2|
+       R1*3|
+       c4-. r r2|
+       R1|
+       g4-. r r2|
+       g4-. r r2|
+       R1*5|
+       r2 r4 g4-.|
+       R1*6|
+       r4 c-.\f r2|
+       R1*2|
+       \property Voice.crescendoText = #'(lines " " "cresc." " ")
+       \property Voice.crescendoSpanner = #'dashed-line
+       r2 c4-.\p\< r|
+       r2 c4-. r|
+       r2 c4-. r|
+       c r c r|
+       \!c1\ff-\trill|
        c8 r g r g r g r|
        g4 r g r|
-       g r c r |
+       g r c r|
        c r c r|
        c r c r|
        c\sf r r2|
@@ -67,6 +59,7 @@ timpani =  \notes \relative c {
        g4 r8 g g4 r8 g|
        g4 r8 g g4 r8 g|
        R1|
+       % should extend over two bars tr ~~~~~~
        g1\trill~|
        g|
        g4 r8 g g4 r8 g|
@@ -93,9 +86,9 @@ timpani =  \notes \relative c {
        g2:16\ff g4 g|
        g c g c|
        c2:16 c4 c|
-       c c c c |
+       c c c c|
        c2:16 c4 c|
-       c c c c |
+       c c c c|
        R1*8|
        g4 r c r|
        c r g r|
@@ -131,8 +124,8 @@ timpani =  \notes \relative c {
        R1|
        c4-. c-. r2|
        c4-. c-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property Voice.decrescendoText = #'(lines " " "dim." " ")
+       \property Voice.decrescendoSpanner = #'dashed-line
        c4\> r g r|
        R1|
        \!c4\p r r2|
@@ -145,14 +138,12 @@ timpani =  \notes \relative c {
 
 timpaniStaff =  \context Staff = timpani <
        \property Staff.midiInstrument = #"timpani"
-       \property Staff.instrument = #"2 Timpani\n(C-G)"
+       \property Staff.instrument = #"Timpani in C-G  "
        \property Staff.instr = #"Timp."
        \clef "bass";
-       \notes< 
-%              \global
-               \time 4/4;
-               \context Voice=timpani
-                       \timpani
-       >
+       \Time
+       \notes { \key c \major; }
+       \context Voice=timpani
+       \timpani
 >