Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(150)

Unified Diff: input/regression/mozart-hrn3-rondo.ily

Issue 4811066: Rewrite regtest mozart-hrn-3.ly (Closed)
Patch Set: Final changes to mozart horn regtest Created 12 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: input/regression/mozart-hrn3-rondo.ily
diff --git a/input/regression/mozart-hrn3-rondo.ily b/input/regression/mozart-hrn3-rondo.ily
index 81e783441778b462224e9caada84ab6848b0d3ac..aeeb211fee862e0e90bd7dbffe6e72311ae651c6 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 "|."
}
« input/regression/mozart-hrn-3.ly ('K') | « input/regression/mozart-hrn3-romanze.ily ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b