move mutopia subdirectory

[lilypond.git] / input / mozart-hrn3-rondo.ly

diff --git a/input/mozart-hrn3-rondo.ly b/input/mozart-hrn3-rondo.ly
index aab198ee6cbc288e0459945f8116dee7eae14a76..95e729845195c251350304f199e699a171b78814 100644 (file)
--- a/input/mozart-hrn3-rondo.ly
+++ b/input/mozart-hrn3-rondo.ly
@@ -1,4 +1,6 @@
-\version "1.3.146"
+\version "1.5.49"
+
+% \include "mozart-hrn3-defs.ly"
 
 rondotheme = \notes \relative c' {
        [c'8 c c] [c c c]
@@ -37,7 +39,7 @@ rondo = \notes        \relative c'
        \rondotheme
        
        R2.*13 |
-       r8 r-\fermata d [d e f]
+       r8 r^\fermata d [d e f]
        [g ()e c-.] [d()e d-.]
        c4 c8 [d e f]
        [g()e c-.] [d()e d-.]
@@ -76,14 +78,14 @@ rondo = \notes      \relative c'
        [b () e d] [c b a]
        \mark "C"
        g4 r8 r4 r8
-       r2. |
+       R2. |
        %
-       r8 [g g] [g( )b b]
+       r8 [g-\f g] [g( )b b-.]
        [b()d d-.] [d()g g-.]
        g2.~
-       [g8 a g] [f e d]
+       [g8 \> a g] [f e d]
        < \rondotheme
-         { s8-\p } >
+         { \! s8-\p } >
          
        R2.*12
        r4 r8 r4 c8
@@ -102,7 +104,13 @@ rondo = \notes     \relative c'
        r4 r8 r4 c'8
        b4()c8 b4()c8
        bes4. ~ bes4 g8
-       a4 c8 [f () d b]
+       a4 () c8 f4 () b,8
+       d4. () c8 r r
+       R2.*3| 
+       r4 r8 r4 c'8
+       b4()c8 b4()c8
+       bes4. ~ bes4 g8
+       a4 c8 [f () d b!]
        d4. () c8 r r
        \mark "E"
        R2.*9  |
@@ -110,11 +118,11 @@ rondo = \notes    \relative c'
        [c8 c' c] c4.~
        [c8 c d] [e e fis] 
        g4 r8 r4 r8
-       r2.
+       R2.
        r8 [g, g] [g g g] |
        es'4. ~ [es8 d c]
        b4 r8 r4 r8
-       r2. |
+       R2. |
        r8 [g g] [g g g]
        es'4. ~ [es8 d c]
        \cresc b4.  c4. d4. e4.
@@ -124,8 +132,13 @@ rondo = \notes     \relative c'
        f2.\f ~ |
        f4 r8 r4 r8
        r8 [g,\> g] [g g g]
-       [fis  g gis] % Edition breitkopf says a-flat (silly!)
+       
+       % Edition breitkopf says a-flat (silly!)
+       [fis  g gis] 
                 [a bes \! b]
+
+       %% EB does the slur in the Rondo differently from the 1st adn 2nd time.
+       %% why. Should check with MS.
        < \rondotheme
          { s8-\p } >
        R2.*7
@@ -143,19 +156,18 @@ rondo = \notes    \relative c'
        \cresc g'2.  bes,2.
        a4. [b16 c d e f g]
        a4. f4 d8
-       [c8\f g' e] [c g e]
-       [\stemUp c \stemDown e' c] \stemBoth [g e c]
+       [\endcresc c8\f g' e] [c g e]
+       [ c e' c]  [g e c]
        g4 r8 [g''8 e c]
 
        
        < d2.(-\trill
          { s2  \grace {  [c16 d] } } >
        
-       \endcresc
        
        )c4 r8 r4 r8
        R2.*5
-       r8 r8-\fermata d8\p [d e f]
+       r8 r8^\fermata d8\p [d e f]
        [g ()e c] [d()e d]
        \cresc [c  c c] [d e f]
        [g()e c] [d()e d]
@@ -163,7 +175,10 @@ rondo = \notes     \relative c'
        R2.*5
        [c8\f c, c] [c c c]
        c4 r8 c4 r8
-       c4 r8 r4 \bar "|."              % B&H do another r8.
+
+        %This is technically incorrect, since we started with an 8th
+       % upstep, but both eulenburg and EB do this as well.
+       c4 r8 r4 r8 \bar "|."           
 }