X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmozart-hrn3-romanze.ily;h=1fa4e962c8eb3d034ccfa9e937ee6b0c177ad8f6;hb=8dfb8cb1d1c7cdb47635ec49b7103194a447e2f9;hp=cca5e1885cf5323954852fda0db15388e311ea57;hpb=1f0dbc5ce41f4fa5aecc2994452b58ba42ca558c;p=lilypond.git

diff --git a/input/regression/mozart-hrn3-romanze.ily b/input/regression/mozart-hrn3-romanze.ily
index cca5e1885c..1fa4e962c8 100644
--- a/input/regression/mozart-hrn3-romanze.ily
+++ b/input/regression/mozart-hrn3-romanze.ily
@@ -1,88 +1,79 @@
-\version "2.11.61"
+\version "2.19.21"
 \include  "mozart-hrn3-defs.ily"
 
-romanze =  \relative c' {
-	\key f \major
-	\time 2/2
-	\set Score.skipBars =  ##t
+romanze =  \relative {
+  \key f \major
+  \time 2/2
 
-	c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } }
-		 f8) a,4 a
-	 bes8[( c d bes]  g4) r8 g
-	a r bes r c r  d[( bes)]
-	a2(  g8[) a( bes  b)]
-	c4. ( f8) a,4 a |
-	% 6 
-	 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.\mf f8   e[ d c bes]
-	% 18
-	 bes[( a d  c)] c4 r
-	R1*2
-	g'4. f8  e[ d c bes]
-	 bes[ (a d  c)] c4 r
-	R1
-	% 25
-	 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"
-	c1\f
-	R1*9
-	f'4.(\p  d8) b4 r8 g
-	g'4.( e8) c4 r8 cis |
-	% 39
-	d4(~  d16[ e d  e)]  f8[ ( d) f( d)]
-	c2( b4) r
-	R1*4
-	e4. ( g8) c,4 ( cis)
-	 d8[( e f  d)] b4 r8 g
-	 c[ ( e) g g]  g[( f e  d)]
-	c4(
-	\grace {
-  \override Stem   #'stroke-style = #"grace"
-   \longgrace e16 \endlonggrace 
-  \revert Stem #'stroke-style }
-
-	 d8.[  c16) \< ]  c8[ c-.( c-. c)-.]\!
-	\mark "C"
-
-	%% this is a trick to get the sfp-s to align. 
-	\override Hairpin   #'transparent = ##t
-	des1\sfp \> 
-	g,1\sfp\!  \> 
-	c\sfp \!   \> 
-	c,\sfp\!
-	\revert Hairpin #'transparent 
-	R1*3
-	r8  c[\p c c] c2~
-	 c8[ c' c c] c2~
-	 c8[ \< e( g f]  e[  d\!\> c bes]
-	\mark "D"
-	a4\!) r r2
-	R1*3
-	c4.\p ( f8) a,4 a |
-	 bes8[ (c d bes)] g4 r8 c,
-	 c8[( e g  bes)]  a[( c f  d)]
-	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
-	c,2 c4. c8
-	 c8[( e g  bes)]  a[( c f  d)]
-	c r e r f4 r4			% -. ? 
-
-	R1
-	c8-.   r e-. r f4 r4
-
-	% Finish with F if played separately 
-	c8-.(   r c,-. r  c4) r4| 
-	\bar "|."
+  c''4.( _\markup { \dynamic "p" \italic { "" con molto espressione } }
+  f8) a,4 a
+  bes8[( c d bes] g4) r8 g
+  a r bes r c r d[( bes)]
+  a2( g8[) a( bes b)]
+  c4. ( f8) a,4 a |
+  % 6
+  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.\mf f8   e[ d c bes]
+  % 18
+  bes[( a d c)] c4 r
+  R1*2
+  g'4. f8  e[ d c bes]
+  bes[ (a d c)] c4 r
+  R1
+  % 25
+  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"
+  c1\f
+  R1*9
+  f'4.(\p  d8) b4 r8 g
+  g'4.( e8) c4 r8 cis |
+  % 39
+  d4(~  16[ e d e)] f8[ ( d) f( d)]
+  c2( b4) r
+  R1*4
+  e4. ( g8) c,4 ( cis)
+  d8[( e f d)] b4 r8 g
+  c[ ( e) g g] g[( f e d)]
+  c4(
+  \grace e16
+  d8.[  c16) \< ]  c8[ c-.( c-. c)-.]\!
+  \mark "C"
+  \override DynamicLineSpanner.staff-padding = #2.5
+  des1\sfp
+  g,1\sfp
+  c\sfp
+  c,\sfp
+  \revert DynamicLineSpanner.staff-padding
+  R1*3
+  r8  c[\p c c] c2~
+  8[ c' c c] c2~
+  8[ \< e( g f] e[ d\!\> c bes]
+  \mark "D"
+  a4\!) r r2
+  R1*3
+  c4.\p ( f8) a,4 a |
+  bes8[ (c d bes)] g4 r8 c,
+  c8[( e g bes)] a[( c f d)]
+  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
+  c,2 c4. c8
+  c8[( e g bes)] a[( c f d)]
+  c r e r f4 r4
+  R1
+  c8-. r e-. r f4 r4
+  % Finish with F if played separately
+  c8-.( r c,-. r c4) r4|
+  \bar "|."
 }