move mutopia subdirectory

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

diff --git a/input/mozart-hrn3-romanze.ly b/input/mozart-hrn3-romanze.ly
index 020d1a9226b0dd6ecc47af52f6eb2622113af4f7..ca6fb662d7a260a57fff63aa64436392515f8ef3 100644 (file)
--- a/input/mozart-hrn3-romanze.ly
+++ b/input/mozart-hrn3-romanze.ly
@@ -1,9 +1,11 @@
 
-\version "1.3.146"
+\version "1.5.49"
+\include  "mozart-hrn3-defs.ly"
 
 romanze = \notes \relative c' {
        \key f \major
        \time 2/2
+       \property Score.skipBars = ##t
 
        c'4.( _#'(italic (dynamic "p") " con molto espressione") 
                )f8 a,4 a
@@ -12,20 +14,20 @@ romanze = \notes \relative c' {
        a2( [)g8 a( bes )b]
        c4. () f8 a,4 a |
        % 6 
-       [bes8 (c d) bes] g4 r8 c,-.
+       [bes8 (c d) bes] g4 r8 c,
        [c8( e g )bes] [a( c f ) d]
        c r e r f r r4
        \mark "A"
        R1*8
-       g4. ()f8  [e( d c) bes]
+       g4.\mf f8  [e d c bes]
        % 18
        [bes( a d )c] c4 r
        R1*2
-       g'4.() f8 [e( d c) bes]
+       g'4. f8 [e d c bes]
        [bes (a d ) c] c4 r
-       r1
+       R1
        % 25
-       [c16\mf ( d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.]
+       [c16 ( d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.]
        [c16\p () d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.]
        [c8 \< c, c c] [c c c \! c ]
        \mark "B"
@@ -41,13 +43,17 @@ romanze = \notes \relative c' {
        [d8( e f )d] b4 r8 g
        [c ()e g g] [g( f e )d]
        c4(
-       \grace { e16 }
-       [d8. )c16] [c8 c--( c-- )c--]
+       \grace { \longgrace e16 \endlonggrace }
+       [d8. )c16 \< ] [c8 c-.( c-. \! )c-.]
        \mark "C"
-       des1\sfp
-       g,1\sfp 
-       c\sfp   
-       c,\sfp  
+
+       %% this is a trick to get the sfp-s to align. 
+       \property Voice.Hairpin \override #'transparent = ##t
+       des1\sfp \> \!
+       g,1\sfp  \> \!
+       c\sfp    \> \!
+       c,\sfp
+       \property Voice.Hairpin \revert #'transparent 
        R1*3
        r8 [c-\p c c] c2~
        [c8 c' c c] c2~
@@ -56,19 +62,19 @@ romanze = \notes \relative c' {
        \! )a4 r r2
        R1*3
        c4.-\p () f8 a,4 a |
-       [bes8 (c d) bes] g4 r8 c,-.
+       [bes8 (c d) bes] g4 r8 c,
        [c8( e g )bes] [a( c f ) d]
-       c-. r e-. r f4 r4
+       c r e r f4 r4
        R1*3
        r2 r4 r8 c,8
        [c8( e g )bes] [a( c f ) d]
-       c-. r e-. r f4 r4       
-       g,1\pp
-       c,2~c4. c8
+       c r e r f4 r4   
+       g,1
+       c,2 c4. c8
        [c8( e g )bes] [a( c f ) d]
        c r e r f4 r4                   % -. ? 
 
-       r1
+       R1
        c8-.   r e-. r f4 r4
 
        % Finish with F if played separately