Update regtest morart-hrn

5 files changed, 461 insertions, 536 deletions

diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index 985b415a9e..eb81691579 100644
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -19,19 +19,27 @@
   source = "Edition Breitkopf 2563"
   footer = "Mutopia-2002/05/21-25"
 
-  tagline = \markup { \smaller
-      \column {
-	   \fill-line { \footer "" }
-	   \fill-line { { "This music is part of the Mutopia project,"
-			  \typewriter { "http://mutopiaproject.org/" }
-			 } }
-	   \fill-line { #(ly:export (string-append "It has been typeset and placed in the public "
-			  "domain by "  maintainer  "."))  }
-	   \fill-line { #(ly:export (string-append "Unrestricted modification and redistribution"
-			  " is permitted and encouraged---copy this music"
-			  " and share it!")) }
-	   }
-       }
+  tagline = \markup {
+    \smaller \column {
+      \fill-line { \footer "" }
+      \fill-line {
+        \line { "This music is part of the Mutopia project,"
+          \url { \typewriter { "http://mutopiaproject.org/" } }
+        }
+      }
+      \fill-line {
+        #(ly:export (string-append  "It has been typeset and placed in the public "
+                                    "domain by " maintainer "."))
+      }
+      \fill-line {
+        \line {
+          "Unrestricted modification and redistribution"
+          "is permitted and encouraged - copy this music"
+          "and share it!"
+        }
+      }
+    }
+  }
 
   texidoc="
 This is the Mozart 3 for horn.  It's from an Edition Breitkopf EB
@@ -48,58 +56,61 @@ virtuoso that taught in Geneva.
 \include "mozart-hrn3-rondo.ily"
 
 \paper {
-    obsolete-between-system-space = 20 \mm
-    system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
-    score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+  system-system-spacing #'basic-distance = 10
+  score-system-spacing #'basic-distance = 20
 }
 
-
 \book {
-    \score {
-	{ \transpose c' bes \allegro }
-	\layout { }
-	\header { piece = "Allegro" opus = "" }
+  \score {
+    { \transpose c' bes \allegro }
+    \layout { }
+    \header {
+      piece = "Allegro"
+      opus = ""
+    }
 
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 90 4)
+    \midi {
+      \context {
+        \Score
+        tempoWholesPerMinute = #(ly:make-moment 90 4)
       }
     }
+  }
 
-
+  \score {
+    { \transpose c' bes \romanze }
+    \header {
+      piece = "Romanze"
+      opus = ""
     }
 
-    \score {
-	{ \transpose c' bes \romanze }
-	\header { piece = "Romanze" opus = "" }
-
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 70 4)
+    \midi {
+      \context {
+        \Score
+        tempoWholesPerMinute = #(ly:make-moment 70 4)
       }
     }
 
+    \layout { }
+  }
 
-	\layout {}
+  \score
+  {
+    { \transpose c' bes \rondo }
+    \header {
+      piece = "Rondo"
+      opus = ""
     }
 
-    \score
-    {
-	{ \transpose c' bes \rondo }
-	\header { piece = "Rondo" opus = "" }
-
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 100 4)
+    \midi {
+      \context {
+        \Score
+        tempoWholesPerMinute = #(ly:make-moment 100 4)
       }
     }
 
-
-	\layout { }
-    }
+    \layout { }
+  }
 }
 
 %% Local Variables:
diff --git a/input/regression/mozart-hrn3-allegro.ily b/input/regression/mozart-hrn3-allegro.ily
index 5f4f1d7269..3b7de4341c 100644
--- a/input/regression/mozart-hrn3-allegro.ily
+++ b/input/regression/mozart-hrn3-allegro.ily
@@ -1,198 +1,158 @@
-\version "2.11.61"
-\include  "mozart-hrn3-defs.ily"
+\version "2.14.0"
+\include "mozart-hrn3-defs.ily"
 
-allegro =
-	
-	\relative c'
-{
-	\time 4/4
-	\key c \major
-	\partial 4
-	r4 
-	|
-	R1*4
-	c'2^"Tutti" g
-	c, r
-	R1*1
-	r8 g' g g  g g e c
-	g'4 g, r2
-	R1*18
-	r2 r4^"Solo" g'4 |
-	\mark "A"
-	e'4. ( c8)  f[ (d c  b) ]
-	 b[( c)] g4 r8  g[ c e]
-	g2.   g16[( f e  f)]
-	dis4 ( e4) r8  c8[-. c-. c-.]
-	c4.(  d16[ e]  f4  e)
-	a,( d g, c)
-	d-. d-. \grace {
-  \override Stem  #'stroke-style = #"grace"
-   e16( 
-  \revert Stem #'stroke-style }
- d8.[) c16 d8. e16]
-	c4 r r2
-	R1*3
-	c,2 ~  c8[ e g c]
-	 c[  b ] b4 r2
-	 c,8[ ( e) g c]  e[( g) e c]
-	 c[( b)] b4 r2
-	c4.( g8 e'4. c8)
-	 g'[( d) ] d4 r4 d
-	 d8[ ( c)] c4.(  d16[ e]  d8[  c)]
-	 c8[(\trill  b)] b4 r2 |
-	d2( ~   d8[ e16 d]  c8[  b)] |
-	 b[( a)] a4 r8  a[ a a]
-	a4( cis e  g)
-	\grace {
-  \override Stem  #'stroke-style = #"grace"
-   \longgrace g16( \endlonggrace 
-  \revert Stem #'stroke-style }
+allegro = \relative c' {
+  \time 4/4
+  \key c \major
+  \partial 4
+  r4 \p
+  |
+  R1*4
+  c'2^"Tutti" g
+  c, r
+  R1*1
+  r8 g' g g g g e c
+  g'4 g, r2
+  R1*18
+  r2 r4^"Solo" g'4 |
+  \mark "A"
+  e'4. ( c8)  f[ (d c b) ]
+  b[( c)] g4 r8  g[ c e]
+  g2.  g16[( f e f)]
+  dis4 ( e4) r8  c8[-. c-. c-.]
+  c4.(  d16[ e] f4  e)
+  a,( d g, c)
+  d-. d-. \acciaccatura e16
+  d8.[ c16 d8. e16]
+  c4 r r2
+  R1*3
+  c,2 ~  c8[ e g c]
+  c[ b ] b4 r2
+  c,8[ ( e) g c] e[( g) e c]
+  c[( b)] b4 r2
+  c4.( g8 e'4. c8)
+  g'[( d) ] d4 r4 d
+  d8[ ( c)] c4.(  d16[ e] d8[  c)]
+  c8[(\trill  b)] b4 r2 |
+  d2( ~  d8[ e16 d] c8[  b)] |
+  b[( a)] a4 r8  a[ a a]
+  a4( cis e g)
+  \appoggiatura g16
+    fis8[( e16  d)] d4-. r2 |
+  \mark "B"
+  R1*3
+  r2 r4  d8[(_\markup { \italic \bold "con espressione" } b) ]
+  a[( g) d'( b)] a[( g) e'( c) ]
+  b8[(  a)] a4 r4  a8[ a]
+  a[( \< b c cis\!\> ]  d4  c\!)
+  ais8[( b)] r8 b\cresc b[( c)] r c
+  cis[ ( d)] r4 r2
+  g,1\!\f ~ g2 ~  g8[ a16 b] c[( d) e c]
+  %% 64
+  f4-. d-. b-. g-.
+  R1
+  c,2\p e4 g c e\cresc g4. e8 |
+  d4.\!\f e16[ fis]  g[ ( fis) e d] c[( b) a g]
+  \afterGrace a1(\trill { g16[ a] }
+  \mark "C"
+  g4) r r2
+  R1*15
+  \mark "D"
+  bes2\mf d4 f
+  g,2~  g8[ g' es c]|
+  bes4(  a4.)  c8[( d es)]
+  cis4( d) r8  bes[ (c d)]
+  es2 ( d4) r
+  es2 ( d4) r
+  c8[( g' es  c)] bes4( c)
+  c4.( cis8  d4) r
+  R1*2
+  es1~es1|
+  e!
+  d
+  c
+  c,
+  e'
+  e,
+  c'2  b8[( a gis  a)]
+  gis8[ e gis b ] e4 r |
+  r8 e,[ a c] dis4 r
+  r8 e,[ gis b ] e4 r
+  r8 e,[ a c] dis4 r
+  r8 e,[ g b] e4 r
+  r8 fis,[ b dis] fis4 r
+  r8 gis,[ b d] f4 r
+  r8 g,[ b d_\ritenuto ] f4 r
+  \mark  "E"
+  R1*8
+  r2 r8  g,[ g g]
+  e'4.( c8)  f[( d c b)]
+  b[( c)] g4 r8  g[ c e] |
+  g2.  g16[( f e f)]
+  dis4( e) r8  c[-. c-. c-.]
+  c4.(  d16[ e] f4  e)
+  a, ( d g, c)
+  d d
+  \acciaccatura e8
+  d8.[ c16 d8. e16]
+  c4 r r2
+  \mark "F"
+  R1*3
+  c,2~ c8[ e g c]
+  c8[( b)] b4 r2
+  c,8[ e g c ]  e[ ( g) e c]
+  c[( b)] b4 r2
+  c2 (bes  a) a8[(b c cis)]
+  d2( ~  d8[ e16 d] \appoggiatura d16
+  c8[ b16  c)]
+  \appoggiatura c16
+  b8[( a16  g)] g4 r2 |
+  R1*3
+  r2 r4  g'8[( e)]
+  \mark "G"
+  d[( c) g'( e)] d[( c) a'( f)]
+  e[( d)] d4 r  d8[ d]
+  d4(~  d16[ e d e)] g8[( f) e d] |
+  c4 r r2
+  R1
+  c1 ~
+  c |
+  c8[-. c-.] r c-. cis[( d)] r d-.\cresc |
+  dis[( e)] r e-. e[( f)] r f-. |
+  g4-.\f e-. c-. bes-. |
+  g-.\ff e-. c-. r |
+  a'2 ~  a8[_""_\markup { \bold \italic "sempre " \dynamic "f" }  b16 c] d[( e d e)]
 
-	 fis8[)( e16  d)] d4-. r2 | 
-	\mark "B"
-	R1*3
-	r2 r4  d8[(_\markup { \italic \bold "con espressione" } b) ]
-	 a[(  g) d'(  b)]  a[(  g) e'(  c) ]
-	 b8[(  a)] a4 r4  a8[ a]
-	 a[( \< b c cis\!\> ]  d4  c\!)
-	 ais8[( b)] r8 b\cresc  b[( c)] r c
-	 cis[ ( d)] r4 r2
-	g,1\!\f ~ g2 ~  g8[ a16 b]  c[( d) e c]
-	%% 64
-	f4-. d-. b-. g-.
-	R1
+  f4. ( d8)  f8[ ( d) f d]
+  c[ (e] g2) \appoggiatura f16
+  e8[( d16  c)]
+  \afterGrace d1_(\trill { c16[ d] }
+  c4) r r2
+  R1 |
+  \mark "H"
+  \times 2/3 { c8[ b a ] }
+  \times 2/3 { g[ a b] }
+  \times 2/3 { c[ d e] }
+  \times 2/3 { f[ e d] } |
+  \times 2/3 { c[ b a ] }
+  \times 2/3 { g[ a b] }
+  \times 2/3 { c[ d e] }
+  \times 2/3 { f[ e d] }|
+  c4 \times 2/3 { r8 g'[( e)]} c4
+  \times 2/3 { r8 e[ ( c)]} |
+  g4 \times 2/3 { r8  c8[( g)] }
+  \times 2/3 { e[ ( g) e-. ] }
+  \times 2/3 { c[ ( e) c-.] }|
+  g4 r8 g'\f a[ b c d]|
+  \afterGrace d1_(\trill { c16[ d] }
+  c4) r r2
+  R1*3
+  c4.^\fermata_"Cadenza ad lib." ( d8) d4.\trill^\fermata (  c16[  d)]
+  c4 r r2
+  R1*8
+  r4  c8.[^"tutti"\f c16] c4 c
+  c c,8.[ c16] c4 c|
+  c2 r2 \bar "|."
 
-	c,2\p e4 g c e\cresc g4. e8 |
-	d4.\!\f  e16[ fis]  g[ ( fis) e d]  c[( b) a g]
-
-	<< a1(\trill
-	  { s2 \grace {
-  \override Stem   #'stroke-style = #"grace"
-    g16[ a] 
-  \revert Stem #'stroke-style }
- } >>
-	\mark "C"
-	 g4) r r2
-	R1*15
-	\mark "D"
-	bes2\mf d4 f
-	g,2~  g8[ g' es c]|
-	bes4(  a4.)  c8[( d  es)]
-	cis4( d) r8  bes[ (c  d)]
-	es2 ( d4) r
-	es2 ( d4) r
-	 c8[( g' es  c)] bes4( c)
-	c4.( cis8  d4) r
-	R1*2
-	es1~es1|
-	e!
-	d
-	c
-	c,
-	e'
-	e,
-	c'2  b8[( a gis  a)]
-	 gis8[ e gis b ] e4 r |
-	r8  e,[ a c] dis4 r
-        r8  e,[ gis b ] e4 r
-	r8  e,[ a c] dis4 r
-	r8  e,[ g b] e4 r
-	r8  fis,[ b dis] fis4 r
-	r8  gis,[ b d] f4 r
-	r8  g,[ b d_\ritenuto ] f4 r
-	\mark  "E"
-	R1*8
-	r2 r8  g,[ g g]
-	e'4.( c8)  f[( d c  b)]
-	 b[( c)] g4 r8  g[ c e] |
-	g2.   g16[( f e  f)]
-	dis4( e) r8  c[-. c-. c-.]
-	c4.(  d16[ e] f4  e)
-	a, ( d g,  c)
-	d d 
-	    \grace {
-  \override Stem   #'stroke-style = #"grace"
-   e8( 
-  \revert Stem #'stroke-style }
-
-	   d8.[) c16 d8. e16] 
-	c4 r r2
-	\mark "F"
-	R1*3
-	c,2~ c8[ e g c]
-	 c8[( b)] b4 r2
-	 c,8[ e g c ]  e[ ( g) e c]
-	 c[( b)] b4 r2
-	c2 (bes  a)  a8[(b c  cis)]
-	d2( ~  d8[ e16 d] \grace {
-  \override Stem   #'stroke-style = #"grace"
-   \longgrace d16( \endlonggrace 
-  \revert Stem #'stroke-style }
-
-%% todo: should insert grace slur here.
-	 c8[ b16  c)]
-	\grace {
-  \override Stem   #'stroke-style = #"grace"
-   \longgrace c16 \endlonggrace 
-  \revert Stem #'stroke-style }
- b8[( a16  g)] g4 r2 |
-	R1*3
-	r2 r4  g'8[( e)]
-	\mark "G"
-	 d[( c) g'( e)]  d[( c) a'( f)]
-	 e[( d)] d4 r  d8[ d]
-	d4(~  d16[ e d  e)]  g8[( f) e d] |
-	c4 r r2
-	R1
-	c1 ~
-	c |
-	 c8[-. c-.] r c-.  cis[( d)] r d-.\cresc |
-	 dis[( e)] r e-.  e[( f)] r f-. |
-	g4-.\!\f  e-. c-. bes-. |
-	g-.\ff e-. c-. r |
-	a'2 ~  a8[_""_\markup { \bold \italic "sempre " \dynamic "f" }  b16 c]  d[( e d  e)]
-
-	
-	f4. ( d8)  f8[ ( d) f d]
-	 c[ (e]  g2) \grace {
-  \override Stem   #'stroke-style = #"grace"
-   \longgrace f16(  \endlonggrace 
-  \revert Stem #'stroke-style }
-  e8[)( d16  c)]
-
-	<< d1\trill _(
-	  { s2 \grace {
-  \override Stem   #'stroke-style = #"grace"
-    c16[ d] 
-  \revert Stem #'stroke-style }
- } >>
-	
-	 c4) r r2
-	R1 |
-	\mark "H"
-	\times 2/3 {  c8[ b a ] } \times 2/3 {  g[ a b] }
-	  \times 2/3 {  c[ d e] } \times 2/3 {  f[ e d] } |
-	\times 2/3 {  c[ b a ] } \times 2/3 {  g[ a b] }
-	  \times 2/3 {  c[ d e] } \times 2/3 {  f[ e d] }|
-	c4 \times 2/3 {  r8  g'[( e)]} c4 \times 2/3 {  r8  e[ ( c)]} |
-	g4 \times 2/3 {  r8  c8[( g)] } \times 2/3 {  e[ ( g) e-. ] } \times 2/3 {  c[ ( e) c-.] }|
-	g4 r8 g'\f  a[ b c d]|
-
-	<< d1_(\trill
-	  { s2 \grace {
-  \override Stem   #'stroke-style = #"grace"
-    c16[ d] 
-  \revert Stem #'stroke-style }
- }  >>
-	 c4) r r2
-	R1*3
-
-	c4.^\fermata_"Cadenza ad lib." ( d8) d4.\trill^\fermata (  c16[  d)] 
-	c4 r r2
-	R1*8
-	r4  c8.[^"tutti"\f c16] c4 c
-	c  c,8.[ c16] c4 c|
-	c2 r2 \bar "|."
-	
 }
 
diff --git a/input/regression/mozart-hrn3-defs.ily b/input/regression/mozart-hrn3-defs.ily
index fe9966d71f..78ef6ab122 100644
--- a/input/regression/mozart-hrn3-defs.ily
+++ b/input/regression/mozart-hrn3-defs.ily
@@ -4,42 +4,25 @@ longgrace = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.11.61"
-  
-\layout {
-    \context {
-        \Score
-        skipBars = ##t
-        midiInstrument = #"french horn"
-        %% try to mimic Breitkopf
-        \override RehearsalMark #'padding = #1
-        \override MultiMeasureRest #'padding = #0.5
-        restNumberThreshold = #1
-
-	\override RehearsalMark #'font-series = #'bold
-	\override RehearsalMark #'font-size = #4.5
+\version "2.14.0"
 
-        \override Beam #'thickness = #0.6
-        \override Beam #'space-function = #(lambda (beam mult) 0.8)
-    }
-    \context {
-        \Staff
-        \override VerticalAxisGroup #'minimum-Y-extent = #'(-2.5 . 3.5)
-    }
+\layout {
+  \context {
+    \Score
+    skipBars = ##t
+    midiInstrument = #"french horn"
+    %% try to mimic Breitkopf
+    \override RehearsalMark #'padding = #1
+    restNumberThreshold = #1
+
+    \override RehearsalMark #'font-series = #'bold
+    \override RehearsalMark #'font-size = #4.5
+  }
 }
 
 \paper{
-
-    % #(define fonts my-sheet)
-
-    % stress page breaking on a6 paper:
-    % line-width = 80 \mm
-    % paper-width = 105 \mm
-    % paper-height = 149 \mm
-    
-    indent = 10. \mm
-    line-width = 189. \mm
-    ragged-last-bottom = ##f
-
+  indent = 10\mm
+  line-width = 189\mm
+  ragged-last-bottom = ##f
 }
 
diff --git a/input/regression/mozart-hrn3-romanze.ily b/input/regression/mozart-hrn3-romanze.ily
index cca5e1885c..aa656bbb23 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.14.0"
 \include  "mozart-hrn3-defs.ily"
 
 romanze =  \relative c' {
-	\key f \major
-	\time 2/2
-	\set Score.skipBars =  ##t
+  \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(~  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 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~
+  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 "|."
 }
 
 
diff --git a/input/regression/mozart-hrn3-rondo.ily b/input/regression/mozart-hrn3-rondo.ily
index 81e7834417..aeeb211fee 100644
--- a/input/regression/mozart-hrn3-rondo.ily
+++ b/input/regression/mozart-hrn3-rondo.ily
@@ -1,194 +1,174 @@
-\version "2.11.61"
+\version "2.14.0"
 
-% \include "mozart-hrn3-defs.ily"
+\include "mozart-hrn3-defs.ily"
 
-rondotheme =  \relative c' {
-	 c'8[ c c]  c[ c c]
-	c4( cis8  d) r g,
-	 d'8[ d d]  d[ d d]
-	d4( dis8  e) r c |
-	 c[( d) e]  f[ g a]
-	 g[ ( e) c] c4 d8
-	e4( d8) e4( f8)
-	e4.( d8) r r |
+rondotheme = \relative c' {
+  c'8[ c c] c[ c c]
+  c4( cis8  d) r g,
+  d'8[ d d] d[ d d]
+  d4( dis8  e) r c |
+  c[( d) e] f[ g a]
+  g[ ( e) c] c4 d8
+  e4( d8) e4( f8)
+  e4.( d8) r r |
 }
 
-lipbreaker =  \relative c'
-{
- 	r8  g'[-. g-.]  c[( e) g,-.]
-	 c[( e) g,-.]  c[( e) g,-.]
-	 c[ c, c]  c[ c c]
-	 c[ c c]  c[ c c]
+lipbreaker = \relative c' {
+  r8  g'[-. g-.] c[( e) g,-.]
+  c[( e) g,-.] c[( e) g,-.]
+  c[ c, c] c[ c c]
+  c[ c c] c[ c c]
 }
 
-rightsixteenth = { \set stemLeftBeamCount =  1
-  \set stemRightBeamCount =  2 }
-leftsixteenth = { \set stemLeftBeamCount =  2
-  \set stemRightBeamCount =  1 }
-bothsixteenth = { \set stemLeftBeamCount =  2
-  \set stemRightBeamCount =  2 }
+rondo = \relative c' {
+  \partial 8
+  \time 6/8
+  \key c \major
 
-rondo =  	\relative c'
-{
-	\partial 8
-	\time 6/8
-	\key c \major
-	
-	g'8\p |
-	
-	\rondotheme
-	
-	R2.*13 |
-	r8 r^\fermata d'  d[ e f]
-	 g[ ( e) c-.]  d[( e) d-.]
-	c4 c8  d[ e f]
-	 g[( e) c-.]  d[( e) d-.]
-	c4 r8 r4 r8 |
-	R2.*7
-	\mark  "A"
-	c4.\p \grace {
-  \override Stem   #'stroke-style = #"grace"
-   e16( 
-  \revert Stem #'stroke-style }
-  d8[) c d]
-	c4 r8 r4 r8
-	e4. \grace {
-  \override Stem   #'stroke-style = #"grace"
-   g16( 
-  \revert Stem #'stroke-style }
-  f8[) e f]
-	e4 r8 r4 r8
-	g4. e4 c8
-	g2.~
-	 g8[ a b]  c[ d e ]
-	e4.( d8) r r
-	R2.*4
-	e2.~ |
-	 e8[ d c]  c[ b a]
-	d2.~
-	 d8[ c b]  b[ a g]
-	g'4( e8) b4( cis8)
-	\mark "B"
-	d4 r8 r4 r8
-	R2.*3 |
-	r8  d[-. d-.]  d[( g) d-.]
-	 d[( g) d-.]  d[ d d]
-	 d[( g)] r r4 r8
-	R2.*1
-	\lipbreaker
-	c,,4 r8  c'[ d e]
-	d4( g8)  c,[ d e]
-	d4 r8 r4 r8
-	R2. |
-	r4 r8  c[-. d-. e-.]
-	d4( g8)  c,[ d e]
-	 d[( g) fis]  e[ d c]
-	 b[ ( e) d]  c[ b a]
-	\mark "C"
-	g4 r8 r4 r8
-	R2. |
-	%
-	r8  g[\f g]  g[(  b) b-.]
-	 b[( d) d-.]  d[( g) g-.]
-	g2.~
-	 g8[ \> a g]  f[ e d]
-	<< \rondotheme
-	  { s8\!\p } >>
-	  
-	R2.*12
-	r4 r8 r4 c8
-	\mark "D"
-	c4 f8 c4 a8
-	a4.~a4 a8
-	bes4 c8 d4 bes8
-	g4. ~ g8 r r
-	R2.*3
-	r4 r8 r4 c8
-	a4. c
-	f ~  f8.[ \rightsixteenth e16(  \bothsixteenth d  c)]
-	bes4 g8 e4 g8
-	c,4. ~ c8 r r
-	R2.*3| 
-	r4 r8 r4 c'8
-	b4( c8) b4( c8)
-	bes4. ~ bes4 g8
-	a4 ( c8) f4 ( b,8)
-	d4. ( c8) r r
-	R2.*3| 
-	r4 r8 r4 c8
-	b4( c8) b4( c8)
-	bes4. ~ bes4 g8
-	a4 c8  f[ ( d) b!]
-	d4. ( c8) r r
-	\mark "E"
-	R2.*9  |
-	\lipbreaker 
-	c,8[ c' c] c4.~
-	c8[ c d]  e[ e fis] 
-	g4 r8 r4 r8
-	R2.
-	r8  g,[ g]  g[ g g] |
-	es'4. ~  es8[ d c]
-	b4 r8 r4 r8
-	R2. |
-	r8  g[ g]  g[ g g]
-	es'4. ~  es8[ d c]
-	b4.\cresc  c4. d4. e4.
-	\mark "F"
-	
-	f2.\!\f ~ |
-	f4 r8 r4 r8
-	r8  g,[\> g]  g[ g g]
-	
-	% Edition breitkopf says a-flat (silly!)
-	 fis[  g gis] 
-		  a[ bes b]\!
+  g'8\p |
 
-	%% EB does the slur in the Rondo differently from the 1st adn 2nd time.
-	%% why. Should check with MS.
-	<< \rondotheme
-	  { s8\p } >>
-	R2.*7
-	\mark "G"
-	R2.*4
-	c,4.\mf c4 c8
-	c4. e4 c8
-	g'4. g4 g8
-	g4. g,4 g8
-	c4 r8 r4 r8
-	r4 r8 r4 g'8
-	 c[ ( e) g,-.] 	 c[ ( e) g,-.]
-	 c[ ( e) g,-.] 	 c[ ( e) g,-.]
-	\mark "H"
-	g'2.\cresc  bes,2.
-	a4.  b16[ c d e f g]
-	a4. f4 d8
-	c8[\!\f g' e]  c[ g e]
-	 c[ e' c]   g[ e c]
-	g4 r8  g''8[ e c]
+  \rondotheme
 
-	
-	<< d2._(\trill
-	  { s2 	\grace {
-  \override Stem   #'stroke-style = #"grace"
-     c16[ d] 
-  \revert Stem #'stroke-style }
- } >>
-	
-	
-	 c4) r8 r4 r8
-	R2.*5
-	r8 r8^\fermata d8\p  d[ e f]
-	 g[ ( e) c]  d[( e) d]
-	c[\cresc  c c]  d[ e f]
-	 g[( e) c]  d[( e) d]
-	c4\!\f  r8 r4 r8
-	R2.*5
-	 c8[\f c, c]  c[ c c]
-	c4 r8 c4 r8
+  R2.*13 |
+  r8 r^\fermata d' d[ e f]
+  g[ ( e) c-.] d[( e) d-.]
+  c4 c8  d[ e f]
+  g[( e) c-.] d[( e) d-.]
+  c4 r8 r4 r8 |
+  R2.*7
+  \mark  "A"
+  c4.\p \acciaccatura e16
+  d8[ c d]
+  c4 r8 r4 r8
+  e4. \acciaccatura g16
+  f8[ e f]
+  e4 r8 r4 r8
+  g4. e4 c8
+  g2.~
+  g8[ a b] c[ d e ]
+  e4.( d8) r r
+  R2.*4
+  e2.~ |
+  e8[ d c] c[ b a]
+  d2.~
+  d8[ c b] b[ a g]
+  g'4( e8) b4( cis8)
+  \mark "B"
+  d4 r8 r4 r8
+  R2.*3 |
+  r8  d[-. d-.] d[( g) d-.]
+  d[( g) d-.] d[ d d]
+  d[( g)] r r4 r8
+  R2.*1
+  \lipbreaker
+  c,,4 r8  c'[ d e]
+  d4( g8)  c,[ d e]
+  d4 r8 r4 r8
+  R2. |
+  r4 r8  c[-. d-. e-.]
+  d4( g8)  c,[ d e]
+  d[( g) fis] e[ d c]
+  b[ ( e) d] c[ b a]
+  \mark "C"
+  g4 r8 r4 r8
+  R2. |
+  r8  g[\f g] g[( b) b-.]
+  b[( d) d-.] d[( g) g-.]
+  g2.~
+  g8[ \> a g] f[ e d]
 
-	% This is technically incorrect, since we started with an 8th
-	% note pickup, but both eulenburg and EB do this as well.
-	c4 r8 r4 r8 \bar "|."		
+  <<
+    \rondotheme
+    { s8\p }
+  >>
+
+  R2.*12
+  r4 r8 r4 c8
+  \mark "D"
+  c4 f8 c4 a8
+  a4.~a4 a8
+  bes4 c8 d4 bes8
+  g4. ~ g8 r r
+  R2.*3
+  r4 r8 r4 c8
+  a4. c
+  f ~  f8.[ e16( d c)]
+  bes4 g8 e4 g8
+  c,4. ~ c8 r r
+  R2.*3|
+  r4 r8 r4 c'8
+  b4( c8) b4( c8)
+  bes4. ~ bes4 g8
+  a4 ( c8) f4 ( b,8)
+  d4. ( c8) r r
+  R2.*3|
+  r4 r8 r4 c8
+  b4( c8) b4( c8)
+  bes4. ~ bes4 g8
+  a4 c8  f[ ( d) b!]
+  d4. ( c8) r r
+  \mark "E"
+  R2.*9  |
+  \lipbreaker
+  c,8[ c' c] c4.~
+  c8[ c d] e[ e fis]
+  g4 r8 r4 r8
+  R2.
+  r8  g,[ g] g[ g g] |
+  es'4. ~  es8[ d c]
+  b4 r8 r4 r8
+  R2. |
+  r8  g[ g] g[ g g]
+  es'4. ~  es8[ d c]
+  b4.\cresc c4. d4. e4.
+  \mark "F"
+  f2.\f ~ |
+  f4 r8 r4 r8
+  r8  g,[\> g] g[ g g]
+
+  % 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
+  \mark "G"
+  R2.*4
+  c,4.\mf c4 c8
+  c4. e4 c8
+  g'4. g4 g8
+  g4. g,4 g8
+  c4 r8 r4 r8
+  r4 r8 r4 g'8
+  c[ ( e) g,-.] c[ ( e) g,-.]
+  c[ ( e) g,-.] c[ ( e) g,-.]
+  \mark "H"
+  g'2.\cresc bes,2.
+  a4. b16[ c d e f g]
+  a4. f4 d8
+  c8[\f g' e] c[ g e]
+  c[ e' c]   g[ e c]
+  g4 r8 g''8[ e c]
+  \afterGrace d2._(\trill { c16[ d] }
+  c4) r8 r4 r8
+  R2.*5
+  r8 r8^\fermata d8\p  d[ e f]
+  g[ ( e) c] d[( e) d]
+  c[\cresc c c] d[ e f]
+  g[( e) c] d[( e) d]
+  c4\f  r8 r4 r8
+  R2.*5
+  c8[\f c, c] c[ c c]
+  c4 r8 c4 r8
+
+  % This is technically incorrect, since we started with an 8th
+  % note pickup, but both eulenburg and EB do this as well.
+  c4 r8 r4 r8 \bar "|."
 }